projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework includes a bit
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
4d34734
..
b5193ec
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-12,35
+12,35
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <ctype.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/stat.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
+#include <lib-lib/debug.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "enter.h"
#include "handler.h"
#include "handler.h"
-#include "mutt_menu.h"
#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include <imap/imap.h>
#include <imap/mx_imap.h>
#include <imap/imap.h>
#include <imap/mx_imap.h>
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
{N_("Del"), OP_DELETE},
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
{N_("Del"), OP_DELETE},
@@
-147,7
+147,7
@@
void mutt_update_num_postponed (void)
UpdateNumPostponed = 1;
}
UpdateNumPostponed = 1;
}
-static void post_entry (char *s, size_t slen, MUTTMENU * menu, int entry)
+static void post_entry (char *s, s
s
ize_t slen, MUTTMENU * menu, int entry)
{
CONTEXT *ctx = (CONTEXT *) menu->data;
{
CONTEXT *ctx = (CONTEXT *) menu->data;
@@
-229,13
+229,13
@@
static HEADER *select_msg (void)
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
- size_t fcclen)
+ s
s
ize_t fcclen)
{
HEADER *h;
int code = SENDPOSTPONED;
{
HEADER *h;
int code = SENDPOSTPONED;
-
LIST
*tmp;
-
LIST
*last = NULL;
-
LIST
*next;
+
string_list_t
*tmp;
+
string_list_t
*last = NULL;
+
string_list_t
*next;
char *p;
int opt_delete;
char *p;
int opt_delete;
@@
-309,7
+309,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
if (*cur)
code |= SENDREPLY;
tmp = next;
if (*cur)
code |= SENDREPLY;
@@
-326,7
+326,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
tmp = next;
}
else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
@@
-343,7
+343,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
tmp = next;
}
else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
@@
-357,7
+357,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
tmp = next;
}
@@
-365,7
+365,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
-
mutt_free_list
(&hdr->chain);
+
string_list_wipe
(&hdr->chain);
t = strtok (tmp->data + 11, " \t\n");
while (t) {
t = strtok (tmp->data + 11, " \t\n");
while (t) {
@@
-379,7
+379,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
#endif
tmp = next;
}
#endif
@@
-541,7
+541,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
|| b == NULL) {
err:
mx_close_message (&msg);
|| b == NULL) {
err:
mx_close_message (&msg);
-
mutt_free_envelope
(&newhdr->env);
+
envelope_delete
(&newhdr->env);
mutt_free_body (&newhdr->content);
mutt_error _("Decryption failed.");
mutt_free_body (&newhdr->content);
mutt_error _("Decryption failed.");
@@
-679,7
+679,7
@@
bail:
mx_close_message (&msg);
if (rv == -1) {
mx_close_message (&msg);
if (rv == -1) {
-
mutt_free_envelope
(&newhdr->env);
+
envelope_delete
(&newhdr->env);
mutt_free_body (&newhdr->content);
}
mutt_free_body (&newhdr->content);
}