* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#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/lib-lib.h>
#include <lib-mime/mime.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+
+#include <lib-sys/unix.h>
+
#include "mutt.h"
-#include "enter.h"
#include "handler.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
-#include "mx.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#include "imap/mx_imap.h"
-#endif
-#include "mutt_crypt.h"
-
-#include "lib/debug.h"
+#include <lib-crypt/crypt.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
+#include <imap/imap.h>
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
if (!Postponed)
return 0;
-#ifdef USE_IMAP
/* LastModify is useless for IMAP */
if (imap_is_magic (Postponed, NULL) == M_IMAP) {
if (force) {
newpc = imap_mailbox_check (Postponed, 0);
if (newpc >= 0) {
PostCount = newpc;
- debug_print (2, ("%d postponed IMAP messages found.\n", PostCount));
}
- else
- debug_print (2, ("using old IMAP postponed count.\n"));
}
return PostCount;
}
-#endif
if (stat (Postponed, &st) == -1) {
PostCount = 0;
UpdateNumPostponed = 1;
}
-static void post_entry (char *s, size_t slen, MUTTMENU * menu, int entry)
+static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
{
CONTEXT *ctx = (CONTEXT *) menu->data;
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
- size_t fcclen)
+ ssize_t fcclen)
{
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;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
- mutt_free_list (&tmp);
+ string_list_wipe(&tmp);
tmp = next;
if (*cur)
code |= SENDREPLY;
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
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) {
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-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) {
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
- mutt_free_list (&tmp);
+ string_list_wipe(&tmp);
tmp = next;
}
#endif
|| b == NULL) {
err:
mx_close_message (&msg);
- mutt_free_envelope (&newhdr->env);
- mutt_free_body (&newhdr->content);
+ envelope_delete(&newhdr->env);
+ body_list_wipe(&newhdr->content);
mutt_error _("Decryption failed.");
return -1;
}
- mutt_free_body (&newhdr->content);
+ body_list_wipe(&newhdr->content);
newhdr->content = b;
mutt_clear_error ();
if (mutt_is_multipart_signed (newhdr->content)) {
newhdr->security |= SIGN;
- if (ascii_strcasecmp (mutt_get_parameter
- ("protocol", newhdr->content->parameter),
- "application/pgp-signature") == 0)
+ if (ascii_strcasecmp(parameter_getval(newhdr->content->parameter, "protocol"),
+ "application/pgp-signature") == 0)
newhdr->security |= APPLICATION_PGP;
else
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
- mutt_free_body (&newhdr->content->parts->next);
+ body_list_wipe(&newhdr->content->parts->next);
newhdr->content = mutt_remove_multipart (newhdr->content);
}
if (b->type == TYPETEXT) {
if (!ascii_strcasecmp
- ("yes", mutt_get_parameter ("x-mutt-noconv", b->parameter)))
+ ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
b->noconv = 1;
else {
s.flags |= M_CHARCONV;
b->noconv = 0;
}
- mutt_delete_parameter ("x-mutt-noconv", &b->parameter);
+ parameter_delval(&b->parameter, "x-mutt-noconv");
}
mutt_adv_mktemp (NULL, file, sizeof (file));
b->type = TYPETEXT;
m_strreplace(&b->subtype, "plain");
- mutt_delete_parameter ("x-action", &b->parameter);
+ parameter_delval(&b->parameter, "x-action");
}
else
mutt_decode_attachment (b, &s);
mutt_stamp_attachment (b);
- mutt_free_body (&b->parts);
+ body_list_wipe(&b->parts);
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
mx_close_message (&msg);
if (rv == -1) {
- mutt_free_envelope (&newhdr->env);
- mutt_free_body (&newhdr->content);
+ envelope_delete(&newhdr->env);
+ body_list_wipe(&newhdr->content);
}
return rv;