X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=7e74f619119bc170054dddc57767f1a609354fc9;hp=553e9b2da5ea7b14b2d5df4a1a5dcfbc4d58414c;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b diff --git a/compose.c b/compose.c index 553e9b2..7e74f61 100644 --- a/compose.c +++ b/compose.c @@ -11,53 +11,36 @@ * 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 #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; } - - +#define CHECK_COUNT \ + if (idxlen == 0) { \ + mutt_error _("There are no attachments."); \ + break; \ + } enum { HDR_FROM = 1, @@ -67,10 +50,7 @@ enum { HDR_SUBJECT, HDR_REPLYTO, HDR_FCC, - -#ifdef MIXMASTER HDR_MIX, -#endif HDR_CRYPT, HDR_CRYPTINFO, @@ -94,18 +74,15 @@ enum { #define W (COLS - HDR_XOFFSET - SW) static const char *Prompts[] = { - "From: ", - "To: ", - "Cc: ", - "Bcc: ", - "Subject: ", - "Reply-To: ", - "Fcc: " + "From: ", + "To: ", + "Cc: ", + "Bcc: ", + "Subject: ", + "Reply-To: ", + "Fcc: ", #ifdef USE_NNTP -#ifdef MIXMASTER - , "" -#endif - , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: " + "", "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: " #endif }; @@ -136,14 +113,11 @@ static struct mapping_t ComposeNewsHelp[] = { 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); + m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt, + ((ATTACHPTR **)menu->data)[num], + M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0)); } -#include "mutt_crypt.h" - static void redraw_crypt_lines (HEADER * msg) { int off = 0; @@ -193,10 +167,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; @@ -224,13 +195,12 @@ static void redraw_mix_line (LIST * chain) c += m_strlen(t) + 2; } } -#endif /* MIXMASTER */ static int check_attachments (ATTACHPTR ** idx, short idxlen) { int i, r; struct stat st; - char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + SHORT_STRING]; + char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + STRING]; for (i = 0; i < idxlen; i++) { m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename); @@ -260,7 +230,7 @@ static void draw_envelope_addr (int line, address_t * addr) char buf[STRING]; buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), addr, 1); + rfc822_addrcat(buf, sizeof (buf), addr, 1); mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]); mutt_paddstr (W, buf); } @@ -275,8 +245,7 @@ static void draw_envelope (HEADER * msg, char *fcc) draw_envelope_addr (HDR_CC, msg->env->cc); draw_envelope_addr (HDR_BCC, msg->env->bcc); #ifdef USE_NNTP - } - else { + } else { mvprintw (HDR_TO, SW, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]); mutt_paddstr (W, NONULL (msg->env->newsgroups)); mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]); @@ -294,10 +263,7 @@ static void draw_envelope (HEADER * msg, char *fcc) mutt_paddstr (W, fcc); redraw_crypt_lines (msg); - -#ifdef MIXMASTER redraw_mix_line (msg->chain); -#endif SETCOLOR (MT_COLOR_STATUS); mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments")); @@ -314,16 +280,16 @@ static int edit_address_list (int line, address_t ** addr) char *err = NULL; mutt_addrlist_to_local (*addr); - rfc822_write_address (buf, sizeof (buf), *addr, 0); + rfc822_addrcat(buf, sizeof (buf), *addr, 0); if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) { - address_delete (addr); + address_list_wipe(addr); *addr = mutt_parse_adrlist (*addr, buf); *addr = mutt_expand_aliases (*addr); } if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); - return (REDRAW_FULL); + return REDRAW_FULL; } if (mutt_addrlist_to_idna (*addr, &err) != 0) { @@ -334,7 +300,7 @@ static int edit_address_list (int line, address_t ** addr) /* redraw the expanded list so the user can see the result */ buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), *addr, 1); + rfc822_addrcat(buf, sizeof (buf), *addr, 1); move (line, HDR_XOFFSET + SW); mutt_paddstr (W, buf); @@ -352,7 +318,7 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x) mutt_error _("You may not delete the only attachment."); idx[x]->content->tagged = 0; - return (-1); + return -1; } for (y = 0; y < *idxlen; y++) { @@ -364,7 +330,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++) @@ -387,18 +353,17 @@ static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen) } -/* +/* * cum_attachs_size: Cumulative Attachments Size * * Returns the total number of bytes used by the attachments in the * attachment list _after_ content-transfer-encodings have been * applied. - * + * */ - -static unsigned long cum_attachs_size (MUTTMENU * menu) +static unsigned long cum_attachs_size(MUTTMENU * menu) { - size_t s; + ssize_t s; unsigned short i; ATTACHPTR **idx = menu->data; CONTENT *info; @@ -431,24 +396,26 @@ static unsigned long cum_attachs_size (MUTTMENU * menu) /* * compose_format_str() * - * %a = total number of attachments + * %a = total number of attachments * %h = hostname [option] - * %l = approx. length of current message (in bytes) - * %v = Mutt version + * %l = approx. length of current message (in bytes) + * %v = Mutt version * * This function is similar to status_format_str(). Look at that function for * help when modifying this function. */ +static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, + const char *p); -static const char *compose_format_str (char *buf, size_t buflen, char op, +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, - unsigned long data, format_flag flags) + const char *ifstr, + const char *elstr, + anytype data, format_flag flags) { - char fmt[SHORT_STRING], tmp[SHORT_STRING]; + char fmt[STRING], tmp[STRING]; int optional = (flags & M_FORMAT_OPTIONAL); - MUTTMENU *menu = (MUTTMENU *) data; + MUTTMENU *menu = data.ptr; *buf = 0; switch (op) { @@ -477,14 +444,12 @@ static const char *compose_format_str (char *buf, size_t buflen, char op, return (src); default: - snprintf (buf, buflen, "%%%s%c", prefix, op); + *buf = 0; break; } - if (optional) - compose_status_line (buf, buflen, menu, ifstring); - else if (flags & M_FORMAT_OPTIONAL) - compose_status_line (buf, buflen, menu, elsestring); + if (flags & M_FORMAT_OPTIONAL) + compose_status_line(buf, buflen, menu, optional ? ifstr : elstr); return (src); } @@ -492,12 +457,9 @@ 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) { - int w=(COLS-SW)>buflen?buflen:(COLS-SW); - mutt_FormatString (buf, w, p, compose_format_str, - (unsigned long) menu, 0); + m_strformat(buf, buflen, COLS - SW, p, compose_format_str, menu, 0); } - /* return values: * * 1 message should be postponed @@ -506,9 +468,10 @@ static void compose_status_line (char *buf, ssize_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 helpstr[STRING]; char buf[LONG_STRING]; char fname[_POSIX_PATH_MAX]; MUTTMENU *menu; @@ -545,14 +508,12 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ menu->data = idx; #ifdef USE_NNTP if (news) - menu->help = - mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, - ComposeNewsHelp); + menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE, + ComposeNewsHelp); else #endif - menu->help = - mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, - ComposeHelp); + menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE, + ComposeHelp); if (option (OPTMBOXPANE)) buffy_check (0); @@ -686,8 +647,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; @@ -696,11 +656,10 @@ 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; - const char *err = NULL; + char *err = NULL; mutt_env_to_local (msg->env); mutt_edit_headers (NONULL (Editor), msg->content->filename, msg, @@ -710,13 +669,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 */ @@ -733,9 +685,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ menu->redraw = REDRAW_FULL; mutt_message_hook (NULL, msg, M_SEND2HOOK); - break; - - + break; case OP_COMPOSE_ATTACH_KEY: if (idxlen == idxmax) { @@ -760,8 +710,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } mutt_message_hook (NULL, msg, M_SEND2HOOK); - break; - + break; case OP_COMPOSE_ATTACH_FILE: { @@ -853,9 +802,7 @@ 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 if (mx_get_magic (fname) != M_POP) #ifdef USE_NNTP if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS)) @@ -1059,11 +1006,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ break; } - -#ifdef MIXMASTER if (msg->chain && mix_check_message (msg) != 0) break; -#endif if (!fccSet && *fcc) { if ((i = query_quadoption (OPT_COPY, @@ -1090,14 +1034,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ idx[menu->current]->content->unlink = !idx[menu->current]->content->unlink; -#if 0 - /* OPTRESOLVE is otherwise ignored on this menu. - * Where's the bug? - */ - - if (option (OPTRESOLVE) && menu->current + 1 < menu->max) - menu->current++; -# endif menu->redraw = REDRAW_INDEX; /* No send2hook since this doesn't change the message. */ break; @@ -1186,7 +1122,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 @@ -1268,7 +1204,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]); } @@ -1332,8 +1268,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } break; - - case OP_COMPOSE_PGP_MENU: if (msg->security & APPLICATION_SMIME) { if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "), @@ -1348,12 +1282,10 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; - case OP_FORGET_PASSPHRASE: crypt_forget_passphrase (); break; - case OP_COMPOSE_SMIME_MENU: if (msg->security & APPLICATION_PGP) { if (mutt_yesorno (_("PGP already selected. Clear & continue ? "), @@ -1368,15 +1300,10 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; - -#ifdef MIXMASTER case OP_COMPOSE_MIX: - mix_make_chain (&msg->chain, &menu->redraw); mutt_message_hook (NULL, msg, M_SEND2HOOK); break; -#endif - } /* Draw formated compose status line */ @@ -1399,9 +1326,9 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ idx[i]->content->aptr = NULL; p_delete(&idx[i]); } - } - else + } else { msg->content = NULL; + } p_delete(&idx);