X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=8a8d0c5c31387c0319f00817e7e816c5a627cdbe;hp=cc4346d3b7887a399574eddb31a4e5b1fadedae8;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/compose.c b/compose.c index cc4346d..8a8d0c5 100644 --- a/compose.c +++ b/compose.c @@ -3,43 +3,42 @@ * Copyright (C) 1996-2000 Michael R. Elkins * Copyright (C) 2004 g10 Code GmbH * + * Parts were written/modified by: + * Nico Golde + * * This file is part of mutt-ng, see http://www.muttng.org/. * It's licensed under the GNU General Public License, * 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 "mutt.h" -#include "mutt_curses.h" +#include "alias.h" #include "mutt_idna.h" -#include "mutt_menu.h" -#include "rfc1524.h" -#include "mime.h" #include "attach.h" -#include "mapping.h" -#include "mailbox.h" +#include "recvattach.h" #include "sort.h" #include "charset.h" -#include "mx.h" +#include "buffy.h" #ifdef MIXMASTER #include "remailer.h" #endif #ifdef USE_NNTP -#include "nntp.h" +#include #endif -#include -#include -#include -#include -#include -#include - static const char *There_are_no_attachments = N_("There are no attachments."); #define CHECK_COUNT if (idxlen == 0) { mutt_error _(There_are_no_attachments); break; } @@ -75,11 +74,12 @@ enum { #endif }; -#define HDR_XOFFSET 14 -#define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */ -#define W (COLS - HDR_XOFFSET - SidebarWidth) +#define HDR_XOFFSET 14 +#define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */ +#define SW (option(OPTMBOXPANE)?SidebarWidth:0) +#define W (COLS - HDR_XOFFSET - SW) -static char *Prompts[] = { +static const char *Prompts[] = { "From: ", "To: ", "Cc: ", @@ -104,7 +104,7 @@ static struct mapping_t ComposeHelp[] = { {N_("Attach file"), OP_COMPOSE_ATTACH_FILE}, {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION}, {N_("Help"), OP_HELP}, - {NULL} + {NULL, OP_NULL} }; #ifdef USE_NNTP @@ -116,39 +116,30 @@ static struct mapping_t ComposeNewsHelp[] = { {N_("Attach file"), OP_COMPOSE_ATTACH_FILE}, {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION}, {N_("Help"), OP_HELP}, - {NULL} + {NULL, OP_NULL} }; #endif -static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num) -{ - mutt_FormatString (b, blen, NONULL (AttachFormat), mutt_attach_fmt, + +static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) { + int w=(COLS-SW)>blen?blen:COLS-SW; + mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt, (unsigned long) (((ATTACHPTR **) menu->data)[num]), M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR); } - - -#include "mutt_crypt.h" +#include static void redraw_crypt_lines (HEADER * msg) { int off = 0; - if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME)) { - if (!msg->security) - mvaddstr (HDR_CRYPT, SidebarWidth, " Security: "); - else if (msg->security & APPLICATION_SMIME) - mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); - else if (msg->security & APPLICATION_PGP) - mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); - } - else if ((WithCrypto & APPLICATION_SMIME)) - mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: "); - else if ((WithCrypto & APPLICATION_PGP)) - mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: "); - else - return; + if (!msg->security) + mvaddstr (HDR_CRYPT, SW, " Security: "); + else if (msg->security & APPLICATION_SMIME) + mvaddstr (HDR_CRYPT, SW, " S/MIME: "); + else if (msg->security & APPLICATION_PGP) + mvaddstr (HDR_CRYPT, SW, " PGP: "); if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN)) addstr (_("Sign, Encrypt")); @@ -159,34 +150,30 @@ static void redraw_crypt_lines (HEADER * msg) else addstr (_("Clear")); - if ((WithCrypto & APPLICATION_PGP)) - if ((msg->security & APPLICATION_PGP) - && (msg->security & (ENCRYPT | SIGN))) { - if ((msg->security & INLINE)) - addstr (_(" (inline)")); - else - addstr (_(" (PGP/MIME)")); - } + if ((msg->security & APPLICATION_PGP) + && (msg->security & (ENCRYPT | SIGN))) { + if ((msg->security & INLINE)) + addstr (_(" (inline)")); + else + addstr (_(" (PGP/MIME)")); + } clrtoeol (); - move (HDR_CRYPTINFO, SidebarWidth); + move (HDR_CRYPTINFO, SW); clrtoeol (); - if ((WithCrypto & APPLICATION_PGP) - && msg->security & APPLICATION_PGP && msg->security & SIGN) + if (msg->security & APPLICATION_PGP && msg->security & SIGN) printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("")); - if ((WithCrypto & APPLICATION_SMIME) - && msg->security & APPLICATION_SMIME && msg->security & SIGN) { + if (msg->security & APPLICATION_SMIME && msg->security & SIGN) { printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("")); } - if ((WithCrypto & APPLICATION_SMIME) - && (msg->security & APPLICATION_SMIME) + if ((msg->security & APPLICATION_SMIME) && (msg->security & ENCRYPT) && SmimeCryptAlg && *SmimeCryptAlg) { - mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "), + mvprintw (HDR_CRYPTINFO, SW + 40, "%s%s", _("Encrypt with: "), NONULL (SmimeCryptAlg)); off = 20; } @@ -195,12 +182,12 @@ static void redraw_crypt_lines (HEADER * msg) #ifdef MIXMASTER -static void redraw_mix_line (LIST * chain) +static void redraw_mix_line (string_list_t * chain) { int c; - char *t; + const char *t; - mvaddstr (HDR_MIX, SidebarWidth, " Mix: "); + mvaddstr (HDR_MIX, SW, " Mix: "); if (!chain) { addstr (""); @@ -213,14 +200,14 @@ static void redraw_mix_line (LIST * chain) if (t && t[0] == '0' && t[1] == '\0') t = ""; - if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth) + if (c + m_strlen(t) + 2 >= COLS - SW) break; addstr (NONULL (t)); if (chain->next) addstr (", "); - c += mutt_strlen (t) + 2; + c += m_strlen(t) + 2; } } #endif /* MIXMASTER */ @@ -232,7 +219,7 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen) char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + SHORT_STRING]; for (i = 0; i < idxlen; i++) { - strfcpy (pretty, idx[i]->content->filename, sizeof (pretty)); + m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename); if (stat (idx[i]->content->filename, &st) != 0) { mutt_pretty_mailbox (pretty); mutt_error (_("%s [#%d] no longer exists!"), pretty, i + 1); @@ -254,13 +241,13 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen) return 0; } -static void draw_envelope_addr (int line, ADDRESS * addr) +static void draw_envelope_addr (int line, address_t * addr) { char buf[STRING]; buf[0] = 0; rfc822_write_address (buf, sizeof (buf), addr, 1); - mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]); + mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]); mutt_paddstr (W, buf); } @@ -276,9 +263,9 @@ static void draw_envelope (HEADER * msg, char *fcc) #ifdef USE_NNTP } else { - mvprintw (HDR_TO, SidebarWidth, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]); + mvprintw (HDR_TO, SW, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]); mutt_paddstr (W, NONULL (msg->env->newsgroups)); - mvprintw (HDR_CC, SidebarWidth, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]); + mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]); mutt_paddstr (W, NONULL (msg->env->followup_to)); if (option (OPTXCOMMENTTO)) { mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]); @@ -286,21 +273,20 @@ static void draw_envelope (HEADER * msg, char *fcc) } } #endif - mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); + mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); mutt_paddstr (W, NONULL (msg->env->subject)); draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); - mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]); + mvprintw (HDR_FCC, SW, TITLE_FMT, Prompts[HDR_FCC - 1]); mutt_paddstr (W, fcc); - if (WithCrypto) - redraw_crypt_lines (msg); + redraw_crypt_lines (msg); #ifdef MIXMASTER redraw_mix_line (msg->chain); #endif SETCOLOR (MT_COLOR_STATUS); - mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments")); + mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments")); BKGDSET (MT_COLOR_STATUS); clrtoeol (); @@ -308,7 +294,7 @@ static void draw_envelope (HEADER * msg, char *fcc) SETCOLOR (MT_COLOR_NORMAL); } -static int edit_address_list (int line, ADDRESS ** addr) +static int edit_address_list (int line, address_t ** addr) { char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */ char *err = NULL; @@ -316,7 +302,7 @@ static int edit_address_list (int line, ADDRESS ** addr) mutt_addrlist_to_local (*addr); rfc822_write_address (buf, sizeof (buf), *addr, 0); if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) { - rfc822_free_address (addr); + address_list_wipe(addr); *addr = mutt_parse_adrlist (*addr, buf); *addr = mutt_expand_aliases (*addr); } @@ -329,13 +315,13 @@ static int edit_address_list (int line, ADDRESS ** addr) if (mutt_addrlist_to_idna (*addr, &err) != 0) { mutt_error (_("Warning: '%s' is a bad IDN."), err); mutt_refresh (); - FREE (&err); + p_delete(&err); } /* redraw the expanded list so the user can see the result */ buf[0] = 0; rfc822_write_address (buf, sizeof (buf), *addr, 1); - move (line, HDR_XOFFSET + SidebarWidth); + move (line, HDR_XOFFSET + SW); mutt_paddstr (W, buf); return 0; @@ -364,9 +350,9 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x) idx[x]->content->next = NULL; idx[x]->content->parts = NULL; - mutt_free_body (&(idx[x]->content)); - FREE (&idx[x]->tree); - FREE (&idx[x]); + body_list_wipe(&(idx[x]->content)); + p_delete(&idx[x]->tree); + p_delete(&idx[x]); for (; x < *idxlen - 1; x++) idx[x] = idx[x + 1]; menu->max = --(*idxlen); @@ -398,7 +384,7 @@ static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen) static unsigned long cum_attachs_size (MUTTMENU * menu) { - size_t s; + ssize_t s; unsigned short i; ATTACHPTR **idx = menu->data; CONTENT *info; @@ -428,10 +414,6 @@ static unsigned long cum_attachs_size (MUTTMENU * menu) return s; } -/* prototype for use below */ -static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu, - const char *p); - /* * compose_format_str() * @@ -444,7 +426,10 @@ static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu, * help when modifying this function. */ -static const char *compose_format_str (char *buf, size_t buflen, char op, +static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, + const char *p); + +static const char *compose_format_str (char *buf, ssize_t buflen, char op, const char *src, const char *prefix, const char *ifstring, const char *elsestring, @@ -473,8 +458,7 @@ static const char *compose_format_str (char *buf, size_t buflen, char op, break; case 'v': - snprintf (fmt, sizeof (fmt), "Mutt-ng %%s"); - snprintf (buf, buflen, fmt, MUTT_VERSION); + m_strcpy(buf, buflen, mutt_make_version (0)); break; case 0: @@ -494,10 +478,11 @@ static const char *compose_format_str (char *buf, size_t buflen, char op, return (src); } -static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu, +static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, const char *p) { - mutt_FormatString (buf, buflen, p, compose_format_str, + int w=(COLS-SW)>buflen?buflen:(COLS-SW); + mutt_FormatString (buf, w, p, compose_format_str, (unsigned long) menu, 0); } @@ -510,7 +495,8 @@ static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu, */ int mutt_compose_menu (HEADER * msg, /* structure for new message */ char *fcc, /* where to save a copy of the message */ - size_t fcclen, HEADER * cur) + ssize_t fcclen, + HEADER * cur __attribute__ ((unused))) { /* current message */ char helpstr[SHORT_STRING]; char buf[LONG_STRING]; @@ -519,7 +505,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ ATTACHPTR **idx = NULL; short idxlen = 0; short idxmax = 0; - int i, close = 0; + int i, closed = 0; int r = -1; /* return value */ int op = 0; int loop = 1; @@ -559,7 +545,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ ComposeHelp); if (option (OPTMBOXPANE)) - mutt_buffy_check (1); + buffy_check (0); while (loop) { #ifdef USE_NNTP unset_option (OPTNEWS); /* for any case */ @@ -608,14 +594,14 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_EDIT_NEWSGROUPS: if (news) { if (msg->env->newsgroups) - strfcpy (buf, msg->env->newsgroups, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->newsgroups); else buf[0] = 0; if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0 && buf[0]) { - FREE (&msg->env->newsgroups); - mutt_remove_trailing_ws (buf); - msg->env->newsgroups = safe_strdup (mutt_skip_whitespace (buf)); + p_delete(&msg->env->newsgroups); + m_strrtrim(buf); + msg->env->newsgroups = m_strdup(skipspaces(buf)); move (HDR_TO, HDR_XOFFSET); clrtoeol (); if (msg->env->newsgroups) @@ -628,12 +614,12 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (news) { buf[0] = 0; if (msg->env->followup_to) - strfcpy (buf, msg->env->followup_to, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->followup_to); if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0 && buf[0]) { - FREE (&msg->env->followup_to); - mutt_remove_trailing_ws (buf); - msg->env->followup_to = safe_strdup (mutt_skip_whitespace (buf)); + p_delete(&msg->env->followup_to); + m_strrtrim(buf); + msg->env->followup_to = m_strdup(skipspaces(buf)); move (HDR_CC, HDR_XOFFSET); clrtoeol (); if (msg->env->followup_to) @@ -646,11 +632,11 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (news && option (OPTXCOMMENTTO)) { buf[0] = 0; if (msg->env->x_comment_to) - strfcpy (buf, msg->env->x_comment_to, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->x_comment_to); if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0 && buf[0]) { - FREE (&msg->env->x_comment_to); - msg->env->x_comment_to = safe_strdup (buf); + p_delete(&msg->env->x_comment_to); + msg->env->x_comment_to = m_strdup(buf); move (HDR_BCC, HDR_XOFFSET); clrtoeol (); if (msg->env->x_comment_to) @@ -661,12 +647,12 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ #endif case OP_COMPOSE_EDIT_SUBJECT: if (msg->env->subject) - strfcpy (buf, msg->env->subject, sizeof (buf)); + m_strcpy(buf, sizeof(buf), msg->env->subject); else buf[0] = 0; if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { - mutt_str_replace (&msg->env->subject, buf); - move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth); + m_strreplace(&msg->env->subject, buf); + move (HDR_SUBJECT, HDR_XOFFSET + SW); clrtoeol (); if (msg->env->subject) mutt_paddstr (W, msg->env->subject); @@ -678,11 +664,11 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_FCC: - strfcpy (buf, fcc, sizeof (buf)); + m_strcpy(buf, sizeof(buf), fcc); if (mutt_get_field ("Fcc: ", buf, sizeof (buf), M_FILE | M_CLEAR) == 0) { - strfcpy (fcc, buf, _POSIX_PATH_MAX); + m_strcpy(fcc, _POSIX_PATH_MAX, buf); mutt_pretty_mailbox (fcc); - move (HDR_FCC, HDR_XOFFSET + SidebarWidth); + move (HDR_FCC, HDR_XOFFSET + SW); mutt_paddstr (W, fcc); fccSet = 1; } @@ -690,8 +676,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_MESSAGE: - if (Editor && (mutt_strcmp ("builtin", Editor) != 0) - && !option (OPTEDITHDRS)) { + if (Editor && !option (OPTEDITHDRS)) { mutt_edit_file (Editor, msg->content->filename); mutt_update_encoding (msg->content); menu->redraw = REDRAW_CURRENT | REDRAW_STATUS; @@ -700,32 +685,25 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } /* fall through */ case OP_COMPOSE_EDIT_HEADERS: - if (mutt_strcmp ("builtin", Editor) != 0 && - (op == OP_COMPOSE_EDIT_HEADERS || + if ((op == OP_COMPOSE_EDIT_HEADERS || (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) { - char *tag = NULL, *err = NULL; + const char *tag = NULL; + char *err = NULL; mutt_env_to_local (msg->env); mutt_edit_headers (NONULL (Editor), msg->content->filename, msg, fcc, fcclen); if (mutt_env_to_idna (msg->env, &tag, &err)) { mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err); - FREE (&err); + p_delete(&err); } } - else { - /* this is grouped with OP_COMPOSE_EDIT_HEADERS because the - attachment list could change if the user invokes ~v to edit - the message with headers, in which we need to execute the - code below to regenerate the index array */ - mutt_builtin_editor (msg->content->filename, msg, cur); - } mutt_update_encoding (msg->content); /* attachments may have been added */ if (idxlen && idx[idxlen - 1]->content->next) { for (i = 0; i < idxlen; i++) - FREE (&idx[i]); + p_delete(&idx[i]); idxlen = 0; idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, @@ -741,21 +719,19 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_ATTACH_KEY: - if (!(WithCrypto & APPLICATION_PGP)) - break; if (idxlen == idxmax) { - safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5)); + p_realloc(&idx, idxmax += 5); menu->data = idx; } - idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); if ((idx[idxlen]->content = crypt_pgp_make_key_attachment (NULL)) != NULL) { update_idx (menu, idx, idxlen++); menu->redraw |= REDRAW_INDEX; } else - FREE (&idx[idxlen]); + p_delete(&idx[idxlen]); menu->redraw |= REDRAW_STATUS; @@ -784,8 +760,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ break; if (idxlen + numfiles >= idxmax) { - safe_realloc (&idx, - sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles)); + p_realloc(&idx, idxmax += 5 + numfiles); menu->data = idx; } @@ -796,18 +771,19 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ for (i = 0; i < numfiles; i++) { char *att = files[i]; - idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); + idx[idxlen]->unowned = 1; idx[idxlen]->content = mutt_make_file_attach (att); if (idx[idxlen]->content != NULL) update_idx (menu, idx, idxlen++); else { error = 1; mutt_error (_("Unable to attach %s!"), att); - FREE (&idx[idxlen]); + p_delete(&idx[idxlen]); } } - FREE (&files); + p_delete(&files); if (!error) mutt_clear_error (); @@ -843,7 +819,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if ((op == OP_COMPOSE_ATTACH_MESSAGE) ^ (Context->magic == M_NNTP)) #endif { - strfcpy (fname, NONULL (Context->path), sizeof (fname)); + m_strcpy(fname, sizeof(fname), NONULL(Context->path)); mutt_pretty_mailbox (fname); } @@ -858,14 +834,10 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ else #endif mutt_expand_path (fname, sizeof (fname)); -#ifdef USE_IMAP - if (!mx_is_imap (fname)) -#endif -#ifdef USE_POP - if (!mx_is_pop (fname)) -#endif + if (mx_get_magic (fname) != M_IMAP) + if (mx_get_magic (fname) != M_POP) #ifdef USE_NNTP - if (!mx_is_nntp (fname) && !option (OPTNEWS)) + if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS)) #endif /* check to make sure the file exists and is readable */ if (access (fname, R_OK) == -1) { @@ -883,7 +855,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (!ctx->msgcount) { mx_close_mailbox (ctx, NULL); - FREE (&ctx); + p_delete(&ctx); mutt_error _("No messages in that folder."); break; @@ -897,7 +869,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ set_option (OPTATTACHMSG); mutt_message _("Tag the messages you want to attach!"); - close = mutt_index_menu (); + closed = mutt_index_menu (); unset_option (OPTATTACHMSG); if (!Context) { @@ -911,33 +883,31 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } if (idxlen + Context->tagged >= idxmax) { - safe_realloc (&idx, - sizeof (ATTACHPTR *) * (idxmax += - 5 + Context->tagged)); + p_realloc(&idx, idxmax += 5 + Context->tagged); menu->data = idx; } for (i = 0; i < Context->msgcount; i++) { h = Context->hdrs[i]; if (h->tagged) { - idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); idx[idxlen]->content = mutt_make_message_attach (Context, h, 1); if (idx[idxlen]->content != NULL) update_idx (menu, idx, idxlen++); else { mutt_error _("Unable to attach!"); - FREE (&idx[idxlen]); + p_delete(&idx[idxlen]); } } } menu->redraw |= REDRAW_FULL; - if (close == OP_QUIT) + if (closed == OP_QUIT) mx_close_mailbox (Context, NULL); else mx_fastclose_mailbox (Context); - FREE (&Context); + p_delete(&Context); /* go back to the folder we started from */ Context = this; @@ -950,6 +920,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_DELETE: CHECK_COUNT; + if (idx[menu->current]->unowned) + idx[menu->current]->content->unlink = 0; if (delete_attachment (menu, &idxlen, menu->current) == -1) break; mutt_update_tree (idx, idxlen); @@ -989,12 +961,11 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_EDIT_DESCRIPTION: CHECK_COUNT; - strfcpy (buf, - idx[menu->current]->content->description ? - idx[menu->current]->content->description : "", sizeof (buf)); + m_strcpy(buf, sizeof(buf), + NONULL(idx[menu->current]->content->description)); /* header names should not be translated */ if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0) { - mutt_str_replace (&idx[menu->current]->content->description, buf); + m_strreplace(&idx[menu->current]->content->description, buf); menu->redraw = REDRAW_CURRENT; } mutt_message_hook (NULL, msg, M_SEND2HOOK); @@ -1041,8 +1012,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_EDIT_ENCODING: CHECK_COUNT; - strfcpy (buf, ENCODING (idx[menu->current]->content->encoding), - sizeof (buf)); + m_strcpy(buf, sizeof(buf), + ENCODING(idx[menu->current]->content->encoding)); if (mutt_get_field ("Content-Transfer-Encoding: ", buf, sizeof (buf), 0) == 0 && buf[0]) { if ((i = mutt_check_encoding (buf)) != ENCOTHER && i != ENCUUENCODED) { @@ -1129,7 +1100,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_RENAME_FILE: CHECK_COUNT; - strfcpy (fname, idx[menu->current]->content->filename, sizeof (fname)); + m_strcpy(fname, sizeof(fname), idx[menu->current]->content->filename); mutt_pretty_mailbox (fname); if (mutt_get_field (_("Rename to: "), fname, sizeof (fname), M_FILE) == 0 && fname[0]) { @@ -1142,7 +1113,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_rename_file (idx[menu->current]->content->filename, fname)) break; - mutt_str_replace (&idx[menu->current]->content->filename, fname); + m_strreplace(&idx[menu->current]->content->filename, fname); menu->redraw = REDRAW_CURRENT; if (idx[menu->current]->content->stamp >= st.st_mtime) @@ -1183,18 +1154,18 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ continue; } if (idxlen == idxmax) { - safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5)); + p_realloc(&idx, idxmax += 5); menu->data = idx; } - idx[idxlen] = (ATTACHPTR *) safe_calloc (1, sizeof (ATTACHPTR)); + idx[idxlen] = p_new(ATTACHPTR, 1); /* Touch the file */ if (!(fp = safe_fopen (fname, "w"))) { mutt_error (_("Can't create file %s"), fname); - FREE (&idx[idxlen]); + p_delete(&idx[idxlen]); continue; } - fclose (fp); + m_fclose(&fp); if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) { mutt_error @@ -1204,7 +1175,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ update_idx (menu, idx, idxlen++); idx[menu->current]->content->type = itype; - mutt_str_replace (&idx[menu->current]->content->subtype, p); + m_strreplace(&idx[menu->current]->content->subtype, p); idx[menu->current]->content->unlink = 1; menu->redraw |= REDRAW_INDEX | REDRAW_STATUS; @@ -1274,11 +1245,13 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ /* avoid freeing other attachments */ idx[idxlen]->content->next = NULL; idx[idxlen]->content->parts = NULL; - mutt_free_body (&idx[idxlen]->content); - FREE (&idx[idxlen]->tree); - FREE (&idx[idxlen]); + if (idx[idxlen]->unowned) + idx[idxlen]->content->unlink = 0; + body_list_wipe(&idx[idxlen]->content); + p_delete(&idx[idxlen]->tree); + p_delete(&idx[idxlen]); } - FREE (&idx); + p_delete(&idx); idxlen = 0; idxmax = 0; r = -1; @@ -1317,7 +1290,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ fname[0] = '\0'; if (Context) { - strfcpy (fname, NONULL (Context->path), sizeof (fname)); + m_strcpy(fname, sizeof(fname), NONULL(Context->path)); mutt_pretty_mailbox (fname); } if (idxlen) @@ -1341,10 +1314,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_PGP_MENU: - if (!(WithCrypto & APPLICATION_PGP)) - break; - if ((WithCrypto & APPLICATION_SMIME) - && msg->security & APPLICATION_SMIME) { + if (msg->security & APPLICATION_SMIME) { if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "), M_YES) != M_YES) { mutt_clear_error (); @@ -1364,11 +1334,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_SMIME_MENU: - if (!(WithCrypto & APPLICATION_SMIME)) - break; - - if ((WithCrypto & APPLICATION_PGP) - && msg->security & APPLICATION_PGP) { + if (msg->security & APPLICATION_PGP) { if (mutt_yesorno (_("PGP already selected. Clear & continue ? "), M_YES) != M_YES) { mutt_clear_error (); @@ -1397,7 +1363,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ compose_status_line (buf, sizeof (buf), menu, NONULL (ComposeFormat)); CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2); SETCOLOR (MT_COLOR_STATUS); - printw ("%-*.*s", COLS, COLS, buf); + move (option (OPTSTATUSONTOP) ? 0 : LINES - 2, SW); + printw ("%-*.*s", COLS-SW, COLS-SW, buf); SETCOLOR (MT_COLOR_NORMAL); menu->redraw &= ~REDRAW_STATUS; } @@ -1409,13 +1376,13 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ msg->content = idx[0]->content; for (i = 0; i < idxlen; i++) { idx[i]->content->aptr = NULL; - FREE (&idx[i]); + p_delete(&idx[i]); } } else msg->content = NULL; - FREE (&idx); + p_delete(&idx); return (r); }