X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=023b32fcf218581ecf5078d0bd1bc2b0da2d1118;hp=4b91fe8de854cf8fe89dda38a774a359b9a293f7;hb=98f62b5fcbd680fd5214ee85e1635b84322cbdd1;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23 diff --git a/postpone.c b/postpone.c index 4b91fe8..023b32f 100644 --- a/postpone.c +++ b/postpone.c @@ -8,47 +8,23 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include #include -#include +#include #include +#include + +#include #include "mutt.h" #include "handler.h" -#include "rfc1524.h" #include "sort.h" #include "thread.h" -#include "mx.h" -#include +#include "crypt.h" #include -#include - -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; @@ -81,7 +57,7 @@ int mutt_num_postponed (int force) return 0; /* LastModify is useless for IMAP */ - if (imap_is_magic (Postponed, NULL) == M_IMAP) { + if (imap_mx.mx_is_magic (Postponed, NULL) == M_IMAP) { if (force) { short newpc; @@ -96,7 +72,7 @@ int mutt_num_postponed (int force) if (stat (Postponed, &st) == -1) { PostCount = 0; LastModify = 0; - return (0); + return 0; } if (S_ISDIR (st.st_mode)) { @@ -113,29 +89,18 @@ int mutt_num_postponed (int force) } 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 + return PostCount = 0; 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); + return PostCount; } void mutt_update_num_postponed (void) @@ -145,17 +110,14 @@ void mutt_update_num_postponed (void) 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 (); @@ -164,8 +126,6 @@ static HEADER *select_msg (void) 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 @@ -207,7 +167,7 @@ static HEADER *select_msg (void) Sort = orig_sort; mutt_menuDestroy (&menu); - return (r > -1 ? PostContext->hdrs[r] : NULL); + return r > -1 ? PostContext->hdrs[r] : NULL; } /* args: @@ -236,13 +196,13 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, int opt_delete; if (!Postponed) - return (-1); + return -1; if ((PostContext = mx_open_mailbox (Postponed, M_NOSORT, NULL)) == NULL) { PostCount = 0; mutt_error _("No postponed messages."); - return (-1); + return -1; } if (!PostContext->msgcount) { @@ -251,7 +211,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, p_delete(&PostContext); mutt_error _("No postponed messages."); - return (-1); + return -1; } if (PostContext->msgcount == 1) { @@ -261,13 +221,13 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, else if ((h = select_msg ()) == NULL) { mx_close_mailbox (PostContext, NULL); p_delete(&PostContext); - return (-1); + return -1; } if (mutt_prepare_template (NULL, PostContext, hdr, h, 0) < 0) { mx_fastclose_mailbox (PostContext); p_delete(&PostContext); - return (-1); + return -1; } /* finished with this message, so delete it. */ @@ -325,10 +285,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, 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; @@ -356,40 +313,14 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, 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); + return code; } - - int mutt_parse_crypt_hdr (char *p, int set_signas) { int pgp = 0; @@ -500,7 +431,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, p_clear(&s, 1); if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL) - return (-1); + return -1; if (!fp) fp = msg->fp; @@ -525,26 +456,23 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, { 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 (); @@ -557,15 +485,14 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, 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); } @@ -607,22 +534,18 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, 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); @@ -631,12 +554,12 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, 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); @@ -644,7 +567,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, mutt_stamp_attachment (b); - mutt_free_body (&b->parts); + body_list_wipe(&b->parts); if (b->hdr) b->hdr->content = NULL; /* avoid dangling pointer */ } @@ -658,7 +581,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, /* 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; @@ -670,13 +593,13 @@ bail: /* 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;