X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=8a8d0c5c31387c0319f00817e7e816c5a627cdbe;hp=91a2894f22067ca1426c6c103dd2d606b5b04125;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3 diff --git a/compose.c b/compose.c index 91a2894..8a8d0c5 100644 --- a/compose.c +++ b/compose.c @@ -11,48 +11,34 @@ * 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 "mutt.h" -#include "enter.h" -#include "mutt_curses.h" +#include "alias.h" #include "mutt_idna.h" -#include "mutt_menu.h" -#include "rfc1524.h" #include "attach.h" #include "recvattach.h" #include "sort.h" #include "charset.h" -#include "mx.h" #include "buffy.h" -#include "compose.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; } @@ -134,33 +120,26 @@ static struct mapping_t ComposeNewsHelp[] = { }; #endif -static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num) { + +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, 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: "); - } - else if ((WithCrypto & APPLICATION_SMIME)) + if (!msg->security) + mvaddstr (HDR_CRYPT, SW, " Security: "); + else if (msg->security & APPLICATION_SMIME) mvaddstr (HDR_CRYPT, SW, " S/MIME: "); - else if ((WithCrypto & APPLICATION_PGP)) + else if (msg->security & APPLICATION_PGP) mvaddstr (HDR_CRYPT, SW, " PGP: "); - else - return; if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN)) addstr (_("Sign, Encrypt")); @@ -171,31 +150,27 @@ 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, 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, SW + 40, "%s%s", _("Encrypt with: "), @@ -207,7 +182,7 @@ 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; const char *t; @@ -266,7 +241,7 @@ 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]; @@ -304,8 +279,7 @@ static void draw_envelope (HEADER * msg, char *fcc) 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); @@ -320,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; @@ -328,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); } @@ -376,7 +350,7 @@ 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)); + body_list_wipe(&(idx[x]->content)); p_delete(&idx[x]->tree); p_delete(&idx[x]); for (; x < *idxlen - 1; x++) @@ -410,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; @@ -452,7 +426,10 @@ static unsigned long cum_attachs_size (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, @@ -501,7 +478,7 @@ 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) { int w=(COLS-SW)>buflen?buflen:(COLS-SW); @@ -518,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]; @@ -527,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; @@ -622,8 +600,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0 && buf[0]) { p_delete(&msg->env->newsgroups); - str_skip_trailws (buf); - msg->env->newsgroups = m_strdup(vskipspaces(buf)); + m_strrtrim(buf); + msg->env->newsgroups = m_strdup(skipspaces(buf)); move (HDR_TO, HDR_XOFFSET); clrtoeol (); if (msg->env->newsgroups) @@ -640,8 +618,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0 && buf[0]) { p_delete(&msg->env->followup_to); - str_skip_trailws (buf); - msg->env->followup_to = m_strdup(vskipspaces(buf)); + m_strrtrim(buf); + msg->env->followup_to = m_strdup(skipspaces(buf)); move (HDR_CC, HDR_XOFFSET); clrtoeol (); if (msg->env->followup_to) @@ -673,7 +651,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ else buf[0] = 0; if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { - str_replace (&msg->env->subject, buf); + m_strreplace(&msg->env->subject, buf); move (HDR_SUBJECT, HDR_XOFFSET + SW); clrtoeol (); if (msg->env->subject) @@ -698,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 && (m_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; @@ -708,8 +685,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } /* fall through */ case OP_COMPOSE_EDIT_HEADERS: - if (m_strcmp("builtin", Editor) != 0 && - (op == OP_COMPOSE_EDIT_HEADERS || + if ((op == OP_COMPOSE_EDIT_HEADERS || (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) { const char *tag = NULL; char *err = NULL; @@ -722,13 +698,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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 */ @@ -750,8 +719,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ case OP_COMPOSE_ATTACH_KEY: - if (!(WithCrypto & APPLICATION_PGP)) - break; if (idxlen == idxmax) { p_realloc(&idx, idxmax += 5); menu->data = idx; @@ -867,12 +834,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ else #endif mutt_expand_path (fname, sizeof (fname)); -#ifdef USE_IMAP if (mx_get_magic (fname) != M_IMAP) -#endif -#ifdef USE_POP if (mx_get_magic (fname) != M_POP) -#endif #ifdef USE_NNTP if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS)) #endif @@ -906,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) { @@ -940,7 +903,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } menu->redraw |= REDRAW_FULL; - if (close == OP_QUIT) + if (closed == OP_QUIT) mx_close_mailbox (Context, NULL); else mx_fastclose_mailbox (Context); @@ -1002,7 +965,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ NONULL(idx[menu->current]->content->description)); /* header names should not be translated */ if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0) { - 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); @@ -1150,7 +1113,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_rename_file (idx[menu->current]->content->filename, fname)) break; - 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) @@ -1202,7 +1165,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ p_delete(&idx[idxlen]); continue; } - fclose (fp); + m_fclose(&fp); if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) { mutt_error @@ -1212,7 +1175,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ update_idx (menu, idx, idxlen++); idx[menu->current]->content->type = itype; - 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; @@ -1284,7 +1247,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ idx[idxlen]->content->parts = NULL; if (idx[idxlen]->unowned) idx[idxlen]->content->unlink = 0; - mutt_free_body (&idx[idxlen]->content); + body_list_wipe(&idx[idxlen]->content); p_delete(&idx[idxlen]->tree); p_delete(&idx[idxlen]); } @@ -1351,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 (); @@ -1374,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 ();