X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=4e0f8692ab881f24d60dc3f5a45a995a1a1259a3;hp=e73b39be9e113171c796d7d27ad930ccafeab32f;hb=91acd32003fb8eb9b3b05b35c1aa32a6c07aad43;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83 diff --git a/postpone.c b/postpone.c index e73b39b..4e0f869 100644 --- a/postpone.c +++ b/postpone.c @@ -8,38 +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 "mutt.h" -#include "enter.h" #include "handler.h" -#include "mutt_menu.h" -#include "rfc1524.h" #include "sort.h" #include "thread.h" -#include "mx.h" -#include +#include "crypt.h" #include -#include - -#include "lib/debug.h" - -#include -#include -#include -#include static struct mapping_t PostponeHelp[] = { {N_("Exit"), OP_EXIT}, @@ -89,10 +75,7 @@ int mutt_num_postponed (int 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; } @@ -147,19 +130,19 @@ void mutt_update_num_postponed (void) 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; _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry], - M_FORMAT_ARROWCURSOR); + option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 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 (); @@ -229,13 +212,13 @@ static HEADER *select_msg (void) * 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; @@ -309,7 +292,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, else hdr->env->userhdrs = tmp->next; tmp->next = NULL; - mutt_free_list (&tmp); + string_list_wipe(&tmp); tmp = next; if (*cur) code |= SENDREPLY; @@ -326,7 +309,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, 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 @@ -343,7 +326,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, 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) { @@ -357,15 +340,13 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, else hdr->env->userhdrs = tmp->next; tmp->next = NULL; - mutt_free_list (&tmp); + string_list_wipe(&tmp); tmp = next; } - -#ifdef MIXMASTER 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) { @@ -379,11 +360,9 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, else hdr->env->userhdrs = tmp->next; tmp->next = NULL; - mutt_free_list (&tmp); + string_list_wipe(&tmp); tmp = next; } -#endif - else { last = tmp; tmp = tmp->next; @@ -529,26 +508,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); - 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 (); @@ -561,15 +537,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); } @@ -611,22 +586,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(MCore.tmpdir), file); + if (!s.fpout) goto bail; - if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) { mutt_body_handler (b, &s); @@ -635,12 +606,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); @@ -648,7 +619,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 */ } @@ -662,7 +633,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; @@ -674,13 +645,13 @@ bail: /* that's it. */ if (bfp != fp) - fclose (bfp); + m_fclose(&bfp); if (msg) 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;