X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=1436a84e3fd780798a662a74833b6a325b095823;hp=d37f0439fa6211fa1c72d292f8094325834cc1fb;hb=f9c8b43480b416548e29d2fccc2a7c5086a6c3a1;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1 diff --git a/postpone.c b/postpone.c index d37f043..1436a84 100644 --- a/postpone.c +++ b/postpone.c @@ -12,34 +12,32 @@ # 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 "mime.h" -#include "mapping.h" #include "sort.h" #include "thread.h" #include "mx.h" -#ifdef USE_IMAP -#include "imap.h" -#include "imap/mx_imap.h" -#endif -#include "mutt_crypt.h" +#include -#include "lib/debug.h" - -#include -#include -#include -#include +#include +#include static struct mapping_t PostponeHelp[] = { {N_("Exit"), OP_EXIT}, @@ -81,7 +79,6 @@ int mutt_num_postponed (int force) if (!Postponed) return 0; -#ifdef USE_IMAP /* LastModify is useless for IMAP */ if (imap_is_magic (Postponed, NULL) == M_IMAP) { if (force) { @@ -90,14 +87,10 @@ 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; } -#endif if (stat (Postponed, &st) == -1) { PostCount = 0; @@ -149,7 +142,7 @@ 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; @@ -231,13 +224,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; @@ -298,8 +291,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, if (ctx) { /* if a mailbox is currently open, look to see if the orignal message the user attempted to reply to is in this mailbox */ - p = tmp->data + 18; - SKIPWS (p); + p = vskipspaces(tmp->data + 18); if (!ctx->id_hash) ctx->id_hash = mutt_make_id_hash (ctx); *cur = hash_find (ctx->id_hash, p); @@ -312,14 +304,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; if (*cur) code |= SENDREPLY; } else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) { - p = tmp->data + 11; - SKIPWS (p); + p = vskipspaces(tmp->data + 11); m_strcpy(fcc, fcclen, p); mutt_pretty_mailbox (fcc); @@ -330,13 +321,12 @@ 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 ((WithCrypto & APPLICATION_PGP) - && (m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated - * by old mutt versions - */ + 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)) { hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1); hdr->security |= APPLICATION_PGP; @@ -348,11 +338,10 @@ 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 ((WithCrypto & APPLICATION_SMIME) - && m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) { + else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) { hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1); hdr->security |= APPLICATION_SMIME; @@ -363,7 +352,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; } @@ -371,7 +360,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, 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) { @@ -385,7 +374,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; } #endif @@ -406,12 +395,7 @@ int mutt_parse_crypt_hdr (char *p, int set_signas) char pgp_sign_as[LONG_STRING] = "\0", *q; char smime_cryptalg[LONG_STRING] = "\0"; - if (!WithCrypto) - return 0; - - SKIPWS (p); - for (; *p; p++) { - + for (p = vskipspaces(p); *p; p++) { switch (*p) { case 'e': case 'E': @@ -490,11 +474,11 @@ int mutt_parse_crypt_hdr (char *p, int set_signas) } /* the cryptalg field must not be empty */ - if ((WithCrypto & APPLICATION_SMIME) && *smime_cryptalg) - str_replace (&SmimeCryptAlg, smime_cryptalg); + if (*smime_cryptalg) + m_strreplace(&SmimeCryptAlg, smime_cryptalg); - if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as)) - str_replace (&PgpSignAs, pgp_sign_as); + if (set_signas || *pgp_sign_as) + m_strreplace(&PgpSignAs, pgp_sign_as); return pgp; } @@ -535,10 +519,10 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, /* decrypt pgp/mime encoded messages */ - if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security) - && mutt_is_multipart_encrypted (newhdr->content)) { - int ccap = - WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security; + if ((APPLICATION_PGP | APPLICATION_SMIME) & hdr->security + && mutt_is_multipart_encrypted (newhdr->content)) + { + int ccap = (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security; newhdr->security |= ENCRYPT | ccap; if (!crypt_valid_passphrase (ccap)) goto err; @@ -552,7 +536,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, || b == NULL) { err: mx_close_message (&msg); - mutt_free_envelope (&newhdr->env); + envelope_delete(&newhdr->env); mutt_free_body (&newhdr->content); mutt_error _("Decryption failed."); @@ -570,15 +554,13 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, * resending messages */ - if (WithCrypto && mutt_is_multipart_signed (newhdr->content)) { + if (mutt_is_multipart_signed (newhdr->content)) { newhdr->security |= SIGN; - if ((WithCrypto & APPLICATION_PGP) - && - ascii_strcasecmp (mutt_get_parameter + if (ascii_strcasecmp (mutt_get_parameter ("protocol", newhdr->content->parameter), "application/pgp-signature") == 0) newhdr->security |= APPLICATION_PGP; - else if ((WithCrypto & APPLICATION_SMIME)) + else newhdr->security |= APPLICATION_SMIME; /* destroy the signature */ @@ -640,15 +622,14 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, goto bail; - if ((WithCrypto & APPLICATION_PGP) - && (mutt_is_application_pgp (b) & (ENCRYPT | SIGN))) { + if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) { mutt_body_handler (b, &s); newhdr->security |= mutt_is_application_pgp (newhdr->content); b->type = TYPETEXT; - str_replace (&b->subtype, "plain"); + m_strreplace(&b->subtype, "plain"); mutt_delete_parameter ("x-action", &b->parameter); } else @@ -657,7 +638,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, if (safe_fclose (&s.fpout) != 0) goto bail; - str_replace (&b->filename, file); + m_strreplace(&b->filename, file); b->unlink = 1; mutt_stamp_attachment (b); @@ -670,12 +651,9 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr, /* Fix encryption flags. */ /* No inline if multipart. */ - if (WithCrypto && (newhdr->security & INLINE) && newhdr->content->next) + if ((newhdr->security & INLINE) && newhdr->content->next) newhdr->security &= ~INLINE; - /* Do we even support multiple mechanisms? */ - newhdr->security &= WithCrypto | ~(APPLICATION_PGP | APPLICATION_SMIME); - /* Theoretically, both could be set. Take the one the user wants to set by default. */ if ((newhdr->security & APPLICATION_PGP) && (newhdr->security & APPLICATION_SMIME)) { @@ -696,7 +674,7 @@ bail: mx_close_message (&msg); if (rv == -1) { - mutt_free_envelope (&newhdr->env); + envelope_delete(&newhdr->env); mutt_free_body (&newhdr->content); }