X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=8a7719ba6409ae3d60728ea19564050e594b75c6;hp=1436a84e3fd780798a662a74833b6a325b095823;hb=4e846802eb1912873b56a27644215e6eeb91dc76;hpb=49081299c673ceebc38d9a4f0985608cb3aecfce diff --git a/postpone.c b/postpone.c index 1436a84..8a7719b 100644 --- a/postpone.c +++ b/postpone.c @@ -8,36 +8,24 @@ * 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 "sort.h" #include "thread.h" -#include "mx.h" -#include +#include "crypt.h" #include -#include static struct mapping_t PostponeHelp[] = { {N_("Exit"), OP_EXIT}, @@ -144,17 +132,15 @@ 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]; + char helpstr[STRING]; short orig_sort; menu = mutt_new_menu (); @@ -324,10 +310,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; @@ -355,8 +338,6 @@ 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; @@ -377,8 +358,6 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, string_list_wipe(&tmp); tmp = next; } -#endif - else { last = tmp; tmp = tmp->next; @@ -524,26 +503,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 (); @@ -556,15 +532,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); } @@ -606,22 +581,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); @@ -630,12 +601,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); @@ -643,7 +614,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 */ } @@ -657,7 +628,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; @@ -669,13 +640,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;