X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/14c29200cb58d3c4a0830265f2433849781858d0..7831684e1868d52ab75bbb833fa3f71553674634:/headers.c?ds=sidebyside diff --git a/headers.c b/headers.c index cace3a9..0aa7915 100644 --- a/headers.c +++ b/headers.c @@ -122,8 +122,8 @@ void mutt_edit_headers (const char *editor, mutt_expand_aliases_env (msg->env); - /* search through the user defined headers added to see if either a - * fcc: or attach-file: field was specified. + /* search through the user defined headers added to see if + * fcc: or attach: or pgp: was specified */ cur = msg->env->userhdrs; @@ -132,10 +132,6 @@ void mutt_edit_headers (const char *editor, { keep = 1; - /* keep track of whether or not we see the in-reply-to field. if we did - * not, remove the references: field later so that we can generate a new - * message based upon this one. - */ if (fcc && ascii_strncasecmp ("fcc:", cur->data, 4) == 0) { p = cur->data + 4; @@ -143,7 +139,7 @@ void mutt_edit_headers (const char *editor, if (*p) { strfcpy (fcc, p, fcclen); - mutt_pretty_mailbox (fcc); + mutt_pretty_mailbox (fcc, fcclen); } keep = 0; } @@ -173,16 +169,14 @@ void mutt_edit_headers (const char *editor, } else { - mutt_pretty_mailbox (path); + mutt_pretty_mailbox (path, sizeof (path)); mutt_error (_("%s: unable to attach file"), path); } } keep = 0; } - - else if ((WithCrypto & APPLICATION_PGP) - &&ascii_strncasecmp ("pgp:", cur->data, 4) == 0) + && ascii_strncasecmp ("pgp:", cur->data, 4) == 0) { msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0, APPLICATION_PGP); if (msg->security)