X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=492dd2c52a6ff793b00e2e42e99b8ab51acaf3eb;hp=5626cb8028b79e9f6729acdc728504d951db2632;hb=40fc05e11b8f95a9661e6e410a9e7b7da7824891;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/commands.c b/commands.c index 5626cb8..492dd2c 100644 --- a/commands.c +++ b/commands.c @@ -12,41 +12,49 @@ # include "config.h" #endif +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include +#include + #include "mutt.h" -#include "mutt_curses.h" -#include "mutt_menu.h" -#include "mime.h" +#include "recvattach.h" #include "sort.h" -#include "mailbox.h" #include "copy.h" #include "mx.h" #include "pager.h" -#include "mutt_crypt.h" +#include #include "mutt_idna.h" #include "rfc1524.h" #include #include #include -#ifdef USE_IMAP -#include "imap.h" -#endif +#include #ifdef BUFFY_SIZE #include "buffy.h" #endif -#include -#include -#include -#include -#include -#include -#include -#include - -extern char *ReleaseDate; - /* The folder the user last saved to. Used by ci_save_message() */ static char LastSaveFolder[_POSIX_PATH_MAX] = ""; @@ -57,8 +65,9 @@ int mutt_display_message (HEADER * cur) int cmflags = M_CM_DECODE | M_CM_DISPLAY | M_CM_CHARCONV; FILE *fpout = NULL; FILE *fpfilterout = NULL; + MESSAGE *msg = NULL; pid_t filterpid = -1; - int res; + int res = 0; snprintf (buf, sizeof (buf), "%s/%s", TYPE (cur->content), cur->content->subtype); @@ -66,38 +75,6 @@ int mutt_display_message (HEADER * cur) mutt_parse_mime_message (Context, cur); mutt_message_hook (Context, cur, M_MESSAGEHOOK); - /* see if crytpo is needed for this message. if so, we should exit curses */ - if (WithCrypto && cur->security) { - if (cur->security & ENCRYPT) { - if (cur->security & APPLICATION_SMIME) - crypt_smime_getkeys (cur->env); - if (!crypt_valid_passphrase (cur->security)) - return 0; - - cmflags |= M_CM_VERIFY; - } - else if (cur->security & SIGN) { - /* find out whether or not the verify signature */ - if (query_quadoption (OPT_VERIFYSIG, _("Verify PGP signature?")) == - M_YES) { - cmflags |= M_CM_VERIFY; - } - } - } - - if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) { - if (cur->security & APPLICATION_PGP) { - if (cur->env->from) - crypt_pgp_invoke_getkeys (cur->env->from); - - crypt_invoke_message (APPLICATION_PGP); - } - - if (cur->security & APPLICATION_SMIME) - crypt_invoke_message (APPLICATION_SMIME); - } - - mutt_mktemp (tempfile); if ((fpout = safe_fopen (tempfile, "w")) == NULL) { mutt_error _("Could not create temporary file!"); @@ -119,7 +96,7 @@ int mutt_display_message (HEADER * cur) } } - if (!Pager || mutt_strcmp (Pager, "builtin") == 0) + if (!Pager || m_strcmp(Pager, "builtin") == 0) builtin = 1; else { mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur); @@ -127,17 +104,68 @@ int mutt_display_message (HEADER * cur) fputs ("\n\n", fpout); } - res = mutt_copy_message (fpout, Context, cur, cmflags, - (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | - CH_DECODE | CH_FROM); + msg = mx_open_message (Context, cur->msgno); + if (msg == NULL) res = -1; + + if (res != -1) { + /* see if crytpo is needed for this message. if so, we should exit curses */ + if (cur->security) { + if (cur->security & ENCRYPT) { + if (cur->security & APPLICATION_SMIME) + crypt_smime_getkeys (cur->env); + if (!crypt_valid_passphrase (cur->security)) + return 0; + + cmflags |= M_CM_VERIFY; + } + else if (cur->security & SIGN) { + /* find out whether or not the verify signature */ + if (query_quadoption (OPT_VERIFYSIG, _("Verify PGP signature?")) == + M_YES) { + cmflags |= M_CM_VERIFY; + } + } + } + + if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) { + if (cur->security & APPLICATION_PGP) { + if (cur->env->from) + crypt_pgp_invoke_getkeys (cur->env->from); + + crypt_invoke_message (APPLICATION_PGP); + } + + if (cur->security & APPLICATION_SMIME) + crypt_invoke_message (APPLICATION_SMIME); + } + + res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags, + (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | + CH_DECODE | CH_FROM); + if (res == 0 && (ferror(fpout) || feof(fpout))) { + debug_print (1, ("_mutt_copy_message failed to detect EOF!\n")); + res = -1; + } + + mx_close_message (&msg); + } + if ((safe_fclose (&fpout) != 0 && errno != EPIPE) || res == -1) { mutt_error (_("Could not copy message")); if (fpfilterout != NULL) { mutt_wait_filter (filterpid); safe_fclose (&fpfilterout); } +#if 0 + /* this is maybe just plain wrong but it makes the pager display + * what we have; i.e. for the crypto stuff we only get + * 'Could not copy message' for invalid passphrases, no PGP output + * not nothing; so just display what we have... + * - pdmef + */ mutt_unlink (tempfile); return 0; +#endif } if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0) @@ -146,20 +174,18 @@ int mutt_display_message (HEADER * cur) safe_fclose (&fpfilterout); /* XXX - check result? */ - if (WithCrypto) { - /* update crypto information for this message */ - cur->security |= crypt_query (cur->content); + /* update crypto information for this message */ + cur->security &= ~(GOODSIGN|BADSIGN); + cur->security |= crypt_query (cur->content); - /* Remove color cache for this message, in case there - are color patterns for both ~g and ~V */ - cur->pair = 0; - } + /* Remove color cache for this message, in case there + are color patterns for both ~g and ~V */ + cur->pair = 0; if (builtin) { pager_t info; - if (WithCrypto - && (cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) { + if ((cur->security & APPLICATION_SMIME) && (cmflags & M_CM_VERIFY)) { if (cur->security & GOODSIGN) { if (!crypt_smime_verify_sender (cur)) mutt_message (_("S/MIME signature successfully verified.")); @@ -173,19 +199,18 @@ int mutt_display_message (HEADER * cur) mutt_error (_("S/MIME signature could NOT be verified.")); } - if (WithCrypto - && (cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) { + if ((cur->security & APPLICATION_PGP) && (cmflags & M_CM_VERIFY)) { if (cur->security & GOODSIGN) mutt_message (_("PGP signature successfully verified.")); else if (cur->security & PARTSIGN) mutt_message (_ ("Warning: Part of this message has not been signed.")); - else + else if (cur->security & SIGN) mutt_message (_("PGP signature could NOT be verified.")); } /* Invoke the builtin pager */ - memset (&info, 0, sizeof (pager_t)); + p_clear(&info, 1); info.hdr = cur; info.ctx = Context; rc = mutt_pager (NULL, tempfile, M_PAGER_MESSAGE, &info); @@ -216,14 +241,14 @@ void ci_bounce_message (HEADER * h, int *redraw) { char prompt[SHORT_STRING]; char buf[HUGE_STRING] = { 0 }; - ADDRESS *adr = NULL; - char *err = NULL; + address_t *adr = NULL; + const char *err = NULL; int rc; if (h) - strfcpy (prompt, _("Bounce message to: "), sizeof (prompt)); + m_strcpy(prompt, sizeof(prompt), _("Bounce message to: ")); else - strfcpy (prompt, _("Bounce tagged messages to: "), sizeof (prompt)); + m_strcpy(prompt, sizeof(prompt), _("Bounce tagged messages to: ")); rc = mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS); @@ -245,8 +270,8 @@ void ci_bounce_message (HEADER * h, int *redraw) if (mutt_addrlist_to_idna (adr, &err) < 0) { mutt_error (_("Bad IDN: '%s'"), err); - FREE (&err); - rfc822_free_address (&adr); + p_delete(&err); + address_list_wipe(&adr); return; } @@ -259,16 +284,15 @@ void ci_bounce_message (HEADER * h, int *redraw) buf); if (mutt_strwidth (prompt) > COLS - extra_space) { - mutt_format_string (prompt, sizeof (prompt), - 0, COLS - extra_space, 0, 0, - prompt, sizeof (prompt), 0); - safe_strcat (prompt, sizeof (prompt), "...?"); + mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0, + prompt, sizeof(prompt), 0); + m_strcat(prompt, sizeof(prompt), "...?"); + } else { + m_strcat(prompt, sizeof(prompt), "?"); } - else - safe_strcat (prompt, sizeof (prompt), "?"); if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) { - rfc822_free_address (&adr); + address_list_wipe(&adr); CLEARLINE (LINES - 1); mutt_message (h ? _("Message not bounced.") : _("Messages not bounced.")); return; @@ -277,7 +301,7 @@ void ci_bounce_message (HEADER * h, int *redraw) CLEARLINE (LINES - 1); rc = mutt_bounce_message (NULL, h, adr); - rfc822_free_address (&adr); + address_list_wipe(&adr); /* If no error, or background, display message. */ if ((rc == 0) || (rc == S_BKG)) mutt_message (h ? _("Message bounced.") : _("Messages bounced.")); @@ -307,7 +331,7 @@ static void pipe_msg (HEADER * h, FILE * fp, int decode, int print) pipe_set_flags (decode, print, &cmflags, &chflags); - if (WithCrypto && decode && h->security & ENCRYPT) { + if (decode && h->security & ENCRYPT) { if (!crypt_valid_passphrase (h->security)) return; endwin (); @@ -322,8 +346,8 @@ static void pipe_msg (HEADER * h, FILE * fp, int decode, int print) /* the following code is shared between printing and piping */ -static int _mutt_pipe_message (HEADER * h, char *cmd, - int decode, int print, int split, char *sep) +static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print, + int split, const char *sep) { int i, rc = 0; @@ -340,7 +364,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, mutt_message_hook (Context, h, M_MESSAGEHOOK); - if (WithCrypto && decode) { + if (decode) { mutt_parse_mime_message (Context, h); if (h->security & ENCRYPT && !crypt_valid_passphrase (h->security)) return 1; @@ -348,7 +372,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, mutt_endwin (NULL); if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter process"); + mutt_perror (_("Can't create filter process")); return 1; } @@ -359,7 +383,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, } else { /* handle tagged messages */ - if (WithCrypto && decode) { + if (decode) { for (i = 0; i < Context->vcount; i++) if (Context->hdrs[Context->v2r[i]]->tagged) { mutt_message_hook (Context, Context->hdrs[Context->v2r[i]], @@ -379,7 +403,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, M_MESSAGEHOOK); mutt_endwin (NULL); if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter process"); + mutt_perror (_("Can't create filter process")); return 1; } @@ -396,7 +420,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd, else { mutt_endwin (NULL); if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) { - mutt_perror _("Can't create filter process"); + mutt_perror (_("Can't create filter process")); return 1; } @@ -527,7 +551,7 @@ void mutt_shell_escape (void) buf[0] = 0; if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) { if (!buf[0] && Shell) - strfcpy (buf, Shell, sizeof (buf)); + m_strcpy(buf, sizeof(buf), Shell); if (buf[0]) { CLEARLINE (LINES - 1); mutt_endwin (NULL); @@ -551,9 +575,9 @@ void mutt_enter_command (void) return; err.data = errbuf; err.dsize = sizeof (errbuf); - memset (&token, 0, sizeof (token)); + p_clear(&token, 1); r = mutt_parse_rc_line (buffer, &token, &err); - FREE (&token.data); + p_delete(&token.data); if (errbuf[0]) { /* since errbuf could potentially contain printf() sequences in it, we must call mutt_error() in this fashion so that vsprintf() @@ -567,11 +591,11 @@ void mutt_enter_command (void) void mutt_display_address (ENVELOPE * env) { - char *pfx = NULL; + const char *pfx = NULL; char buf[SHORT_STRING]; - ADDRESS *adr = NULL; + address_t *adr = NULL; - adr = mutt_get_address (env, &pfx); + adr = mutt_get_address(env, &pfx); if (!adr) return; @@ -594,17 +618,14 @@ static void set_copy_flags (HEADER * hdr, int decode, int decrypt, *cmflags = 0; *chflags = CH_UPDATE_LEN; - if (WithCrypto && !decode && decrypt && (hdr->security & ENCRYPT)) { - if ((WithCrypto & APPLICATION_PGP) - && mutt_is_multipart_encrypted (hdr->content)) { + if (!decode && decrypt && (hdr->security & ENCRYPT)) { + if (mutt_is_multipart_encrypted (hdr->content)) { *chflags = CH_NONEWLINE | CH_XMIT | CH_MIME; *cmflags = M_CM_DECODE_PGP; } - else if ((WithCrypto & APPLICATION_PGP) - && mutt_is_application_pgp (hdr->content) & ENCRYPT) + else if (mutt_is_application_pgp (hdr->content) & ENCRYPT) decode = 1; - else if ((WithCrypto & APPLICATION_SMIME) - && mutt_is_application_smime (hdr->content) & ENCRYPT) { + else if (mutt_is_application_smime (hdr->content) & ENCRYPT) { *chflags = CH_NONEWLINE | CH_XMIT | CH_MIME; *cmflags = M_CM_DECODE_SMIME; } @@ -625,30 +646,31 @@ static void set_copy_flags (HEADER * hdr, int decode, int decrypt, } } -void _mutt_save_message (HEADER * h, CONTEXT * ctx, int delete, int decode, - int decrypt) -{ +int _mutt_save_message (HEADER * h, CONTEXT * ctx, int delete, int decode, + int decrypt) { int cmflags, chflags; + int rc; set_copy_flags (h, decode, decrypt, &cmflags, &chflags); if (decode || decrypt) mutt_parse_mime_message (Context, h); - if (mutt_append_message (ctx, Context, h, cmflags, chflags) == 0) { - if (delete) { - mutt_set_flag (Context, h, M_DELETE, 1); - if (option (OPTDELETEUNTAG)) - mutt_set_flag (Context, h, M_TAG, 0); - } + if ((rc = mutt_append_message (ctx, Context, h, cmflags, chflags)) != 0) + return rc; + + if (delete) { + mutt_set_flag (Context, h, M_DELETE, 1); + if (option (OPTDELETEUNTAG)) + mutt_set_flag (Context, h, M_TAG, 0); mutt_set_flag (Context, h, M_APPENDED, 1); } + return (0); } /* returns 0 if the copy/save was successful, or -1 on error/abort */ int mutt_save_message (HEADER * h, int delete, - int decode, int decrypt, int *redraw) -{ + int decode, int decrypt, int *redraw) { int i, need_buffy_cleanup; int need_passphrase = 0, app = 0; char prompt[SHORT_STRING], buf[_POSIX_PATH_MAX]; @@ -674,10 +696,8 @@ int mutt_save_message (HEADER * h, int delete, if (h) { - if (WithCrypto) { - need_passphrase = h->security & ENCRYPT; - app = h->security; - } + need_passphrase = h->security & ENCRYPT; + app = h->security; mutt_message_hook (Context, h, M_MESSAGEHOOK); mutt_default_save (buf, sizeof (buf), h); } @@ -695,10 +715,8 @@ int mutt_save_message (HEADER * h, int delete, if (h) { mutt_message_hook (Context, h, M_MESSAGEHOOK); mutt_default_save (buf, sizeof (buf), h); - if (WithCrypto) { - need_passphrase = h->security & ENCRYPT; - app = h->security; - } + need_passphrase = h->security & ENCRYPT; + app = h->security; h = NULL; } } @@ -720,10 +738,10 @@ int mutt_save_message (HEADER * h, int delete, /* This is an undocumented feature of ELM pointed out to me by Felix von * Leitner */ - if (mutt_strcmp (buf, ".") == 0) - strfcpy (buf, LastSaveFolder, sizeof (buf)); + if (m_strcmp(buf, ".") == 0) + m_strcpy(buf, sizeof(buf), LastSaveFolder); else - strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder)); + m_strcpy(LastSaveFolder, sizeof(LastSaveFolder), buf); mutt_expand_path (buf, sizeof (buf)); @@ -731,14 +749,13 @@ int mutt_save_message (HEADER * h, int delete, if (mutt_save_confirm (buf, &st) != 0) return -1; - if (WithCrypto && need_passphrase && (decode || decrypt) + if (need_passphrase && (decode || decrypt) && !crypt_valid_passphrase (app)) return -1; mutt_message (_("Copying to %s..."), buf); -#ifdef USE_IMAP - if (Context->magic == M_IMAP && !(decode || decrypt) && mx_is_imap (buf)) { + if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) { switch (imap_copy_messages (Context, h, buf, delete)) { /* success */ case 0: @@ -752,18 +769,23 @@ int mutt_save_message (HEADER * h, int delete, return -1; } } -#endif if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL) { - if (h) - _mutt_save_message (h, &ctx, delete, decode, decrypt); - else { + if (h) { + if (_mutt_save_message (h, &ctx, delete, decode, decrypt) != 0) { + mx_close_mailbox (&ctx, NULL); + return (-1); + } + } else { for (i = 0; i < Context->vcount; i++) { if (Context->hdrs[Context->v2r[i]]->tagged) { mutt_message_hook (Context, Context->hdrs[Context->v2r[i]], M_MESSAGEHOOK); - _mutt_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete, - decode, decrypt); + if (_mutt_save_message (Context->hdrs[Context->v2r[i]], &ctx, delete, + decode, decrypt) != 0) { + mx_close_mailbox (&ctx, NULL); + return (-1); + } } } } @@ -774,9 +796,9 @@ int mutt_save_message (HEADER * h, int delete, if (need_buffy_cleanup) { #ifdef BUFFY_SIZE - tmp = mutt_find_mailbox (buf); + tmp = buffy_find_mailbox (buf); if (tmp && tmp->new <= 0) - mutt_update_mailbox (tmp); + buffy_update_mailbox (tmp); #else /* fix up the times so buffy won't get confused */ if (st.st_mtime > st.st_atime) { @@ -796,129 +818,9 @@ int mutt_save_message (HEADER * h, int delete, return -1; } -int mutt_update_list_file (char *filename, char *section, char *key, - char *line) -{ - FILE *ifp; - FILE *ofp; - char buf[HUGE_STRING]; - char oldfile[_POSIX_PATH_MAX]; - char *c; - int ext = 0, done = 0, r = 0; - - snprintf (oldfile, sizeof (oldfile), "%s.bak", filename); - dprint (1, (debugfile, "Renaming %s to %s\n", filename, oldfile)); - - /* if file not exist, create it */ - if ((ifp = safe_fopen (filename, "a"))) - fclose (ifp); - if (_mutt_rename_file (filename, oldfile, 1)) { - mutt_perror _("Unable to create backup file"); - - return (-1); - } - dprint (1, (debugfile, "Opening %s\n", oldfile)); - if (!(ifp = safe_fopen (oldfile, "r"))) { - mutt_perror _("Unable to open backup file for reading"); - - return (-1); - } - dprint (1, (debugfile, "Opening %s\n", filename)); - if (!(ofp = safe_fopen (filename, "w"))) { - fclose (ifp); - mutt_perror _("Unable to open new file for writing"); - - return (-1); - } - if (mx_lock_file (filename, fileno (ofp), 1, 0, 1)) { - fclose (ofp); - fclose (ifp); - mutt_error (_("Unable to lock %s, old file saved as %s"), filename, - oldfile); - return (-1); - } - - if (section) { - while (r != EOF && !done && fgets (buf, sizeof (buf), ifp)) { - r = fputs (buf, ofp); - c = buf; - while (*c && *c != '\n') - c++; - c[0] = 0; /* strip EOL */ - if (!strncmp (buf, "#: ", 3) && !mutt_strcasecmp (buf + 3, section)) - done++; - } - if (r != EOF && !done) { - snprintf (buf, sizeof (buf), "#: %s\n", section); - r = fputs (buf, ofp); - } - done = 0; - } - - while (r != EOF && fgets (buf, sizeof (buf), ifp)) { - if (ext) { - c = buf; - while (*c && (*c != '\r') && (*c != '\n')) - c++; - c--; - if (*c != '\\') - ext = 0; - } - else if ((section && !strncmp (buf, "#: ", 3))) { - if (!done && line) { - fputs (line, ofp); - fputc ('\n', ofp); - } - r = fputs (buf, ofp); - done++; - break; - } - else if (key && !strncmp (buf, key, strlen (key)) && - (!*key || buf[strlen (key)] == ' ')) { - c = buf; - ext = 0; - while (*c && (*c != '\r') && (*c != '\n')) - c++; - c--; - if (*c == '\\') - ext = 1; - if (!done && line) { - r = fputs (line, ofp); - if (*key) - r = fputc ('\n', ofp); - done++; - } - } - else { - r = fputs (buf, ofp); - } - } - - while (r != EOF && fgets (buf, sizeof (buf), ifp)) - r = fputs (buf, ofp); - - /* If there wasn't a line to replace, put it on the end of the file */ - if (r != EOF && !done && line) { - fputs (line, ofp); - r = fputc ('\n', ofp); - } - mx_unlock_file (filename, fileno (ofp), 0); - fclose (ofp); - fclose (ifp); - if (r != EOF) { - unlink (oldfile); - return 0; - } - unlink (filename); - mutt_error (_("Cannot write new %s, old file saved as %s"), filename, - oldfile); - return (-1); -} - - void mutt_version (void) { - mutt_message ("Mutt-ng %s (%s)", MUTT_VERSION, ReleaseDate); + mutt_message (mutt_make_version (1)); } void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) @@ -935,17 +837,17 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) short type_changed = 0; cp = mutt_get_parameter ("charset", b->parameter); - strfcpy (charset, NONULL (cp), sizeof (charset)); + m_strcpy(charset, sizeof(charset), NONULL(cp)); snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype); - strfcpy (obuf, buf, sizeof (obuf)); + m_strcpy(obuf, sizeof(obuf), buf); if (b->parameter) { - size_t l; + ssize_t l; for (p = b->parameter; p; p = p->next) { - l = strlen (buf); + l = m_strlen(buf); - rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials); + rfc822_strcpy(tmp, sizeof(tmp), p->value, MimeSpecials); snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp); } } @@ -955,8 +857,8 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) return; /* clean up previous junk */ - mutt_free_parameter (&b->parameter); - FREE (&b->subtype); + parameter_list_wipe(&b->parameter); + p_delete(&b->subtype); mutt_parse_content_type (buf, b); @@ -992,17 +894,17 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) b->force_charset |= charset_changed ? 1 : 0; - if (!is_multipart (b) && b->parts) + if (!is_multipart(b) && b->parts) mutt_free_body (&b->parts); if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) { b->hdr->content = NULL; - mutt_free_header (&b->hdr); + header_delete(&b->hdr); } - if (fp && (is_multipart (b) || mutt_is_message_type (b->type, b->subtype))) + if (fp && (is_multipart(b) || mutt_is_message_type(b->type, b->subtype))) mutt_parse_part (fp, b); - if (WithCrypto && h) { + if (h) { if (h->content == b) h->security = 0;