* 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/lib-lib.h>
#include <lib-mime/mime.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
+
+#include <lib-sys/unix.h>
#include "mutt.h"
#include "handler.h"
#include "sort.h"
#include "thread.h"
-#include "mx.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include <imap/imap.h>
-#include <imap/mx_imap.h>
-
-static struct mapping_t PostponeHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Del"), OP_DELETE},
- {N_("Undel"), OP_UNDELETE},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
-
static short PostCount = 0;
static CONTEXT *PostContext = NULL;
}
if (LastModify < st.st_mtime) {
-#ifdef USE_NNTP
- int optnews = option (OPTNEWS);
-#endif
LastModify = st.st_mtime;
if (access (Postponed, R_OK | F_OK) != 0)
return (PostCount = 0);
-#ifdef USE_NNTP
- if (optnews)
- unset_option (OPTNEWS);
-#endif
if (mx_open_mailbox (Postponed, M_NOSORT | M_QUIET, &ctx) == NULL)
PostCount = 0;
else
PostCount = ctx.msgcount;
mx_fastclose_mailbox (&ctx);
-#ifdef USE_NNTP
- if (optnews)
- set_option (OPTNEWS);
-#endif
}
return (PostCount);
static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
{
- CONTEXT *ctx = (CONTEXT *) menu->data;
-
- _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
- M_FORMAT_ARROWCURSOR);
+ CONTEXT *ctx = (CONTEXT *)menu->data;
+ _mutt_make_string(s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry], 0);
}
static HEADER *select_msg (void)
{
MUTTMENU *menu;
int i, done = 0, r = -1;
- char helpstr[SHORT_STRING];
short orig_sort;
menu = mutt_new_menu ();
menu->max = PostContext->msgcount;
menu->title = _("Postponed Messages");
menu->data = PostContext;
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_POST, PostponeHelp);
/* The postponed mailbox is setup to have sorting disabled, but the global
* Sort variable may indicate something different. Sorting has to be
string_list_wipe(&tmp);
tmp = next;
}
- else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
- * by old mutt versions
- */
- || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+ else if (m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
string_list_wipe(&tmp);
tmp = next;
}
-
-#ifdef MIXMASTER
- else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
- char *t;
-
- string_list_wipe(&hdr->chain);
-
- t = strtok (tmp->data + 11, " \t\n");
- while (t) {
- hdr->chain = mutt_add_list (hdr->chain, t);
- t = strtok (NULL, " \t\n");
- }
-
- next = tmp->next;
- if (last)
- last->next = tmp->next;
- else
- hdr->env->userhdrs = tmp->next;
- tmp->next = NULL;
- string_list_wipe(&tmp);
- tmp = next;
- }
-#endif
-
else {
last = tmp;
tmp = tmp->next;
return (code);
}
-
-
int mutt_parse_crypt_hdr (char *p, int set_signas)
{
int pgp = 0;
{
int ccap = (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
newhdr->security |= ENCRYPT | ccap;
- if (!crypt_valid_passphrase (ccap))
- goto err;
-
mutt_message _("Decrypting message...");
if (((ccap & APPLICATION_PGP)
&& crypt_pgp_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
|| ((ccap & APPLICATION_SMIME)
&& crypt_smime_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
- || b == NULL) {
- err:
+ || b == NULL)
+ {
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);
}
s.flags = 0;
if (b->type == TYPETEXT) {
- if (!ascii_strcasecmp
- ("yes", mutt_get_parameter ("x-mutt-noconv", b->parameter)))
- b->noconv = 1;
- else {
+ b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+ "x-mutt-noconv"));
+ if (b->noconv)
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));
- if ((s.fpout = safe_fopen (file, "w")) == NULL)
+ s.fpout = m_tempfile(file, sizeof(file), NONULL(mod_core.tmpdir), file);
+ if (!s.fpout)
goto bail;
-
if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
mutt_body_handler (b, &s);
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);
- if (safe_fclose (&s.fpout) != 0)
+ if (m_fclose(&s.fpout) != 0)
goto bail;
m_strreplace(&b->filename, file);
mutt_stamp_attachment (b);
- mutt_free_body (&b->parts);
+ body_list_wipe(&b->parts);
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
/* Theoretically, both could be set. Take the one the user wants to set by default. */
if ((newhdr->security & APPLICATION_PGP)
&& (newhdr->security & APPLICATION_SMIME)) {
- if (option (OPTSMIMEISDEFAULT))
+ if (mod_crypt.smime_is_default)
newhdr->security &= ~APPLICATION_PGP;
else
newhdr->security &= ~APPLICATION_SMIME;
/* that's it. */
if (bfp != fp)
- fclose (bfp);
+ m_fclose(&bfp);
if (msg)
mx_close_message (&msg);
if (rv == -1) {
envelope_delete(&newhdr->env);
- mutt_free_body (&newhdr->content);
+ body_list_wipe(&newhdr->content);
}
return rv;
projects / apps / madmutt.git / blobdiff