X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=a21776e98b4aa137cec3b91d61e096d418df6471;hp=a37955e1498cfef6b37ed8a2d32d2f2ab99a6de5;hb=26a1babec6628dff14e428def9cff4e92a4ef7c8;hpb=97677c08933e16e25ecb3c12473ef1efdab7962b diff --git a/compose.c b/compose.c index a37955e..a21776e 100644 --- a/compose.c +++ b/compose.c @@ -11,22 +11,7 @@ * 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 @@ -35,24 +20,20 @@ #include #include #include +#include #include "mutt.h" +#include "alias.h" #include "mutt_idna.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 static const char *There_are_no_attachments = N_("There are no attachments."); @@ -69,10 +50,7 @@ enum { HDR_SUBJECT, HDR_REPLYTO, HDR_FCC, - -#ifdef MIXMASTER HDR_MIX, -#endif HDR_CRYPT, HDR_CRYPTINFO, @@ -102,12 +80,10 @@ static const char *Prompts[] = { "Bcc: ", "Subject: ", "Reply-To: ", - "Fcc: " + "Fcc: ", #ifdef USE_NNTP -#ifdef MIXMASTER - , "" -#endif - , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: " + "", + "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: " #endif }; @@ -195,10 +171,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; @@ -226,7 +199,6 @@ static void redraw_mix_line (LIST * chain) c += m_strlen(t) + 2; } } -#endif /* MIXMASTER */ static int check_attachments (ATTACHPTR ** idx, short idxlen) { @@ -296,10 +268,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")); @@ -318,7 +287,7 @@ static int edit_address_list (int line, address_t ** 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) { - address_delete (addr); + address_list_wipe(addr); *addr = mutt_parse_adrlist (*addr, buf); *addr = mutt_expand_aliases (*addr); } @@ -366,7 +335,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++) @@ -400,7 +369,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; @@ -442,7 +411,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, @@ -508,7 +480,8 @@ 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 buf[LONG_STRING]; @@ -700,7 +673,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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, @@ -1050,11 +1023,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, @@ -1081,14 +1051,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; @@ -1177,7 +1139,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 @@ -1259,7 +1221,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]); } @@ -1359,15 +1321,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 */