* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# 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/debug.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include "mutt.h"
#include "handler.h"
-#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
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;
}
err:
mx_close_message (&msg);
envelope_delete(&newhdr->env);
- mutt_free_body (&newhdr->content);
+ 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 */
}
if (rv == -1) {
envelope_delete(&newhdr->env);
- mutt_free_body (&newhdr->content);
+ body_list_wipe(&newhdr->content);
}
return rv;