* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
+
+#include <lib-sys/unix.h>
+#include <lib-mime/mime.h>
+
+#include <lib-ui/lib-ui.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
+#include "alias.h"
+#include "crypt.h"
#include "mutt_idna.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
-#include "mime.h"
#include "attach.h"
#include "recvattach.h"
-#include "mapping.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"
-#endif
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-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,
HDR_REPLYTO,
HDR_FCC,
-#ifdef MIXMASTER
- HDR_MIX,
-#endif
-
HDR_CRYPT,
HDR_CRYPTINFO,
-#ifdef USE_NNTP
- HDR_NEWSGROUPS,
- HDR_FOLLOWUPTO,
- HDR_XCOMMENTTO,
-#endif
-
-#ifndef USE_NNTP
- HDR_ATTACH = (HDR_FCC + 5) /* where to start printing the attachments */
-#else
HDR_ATTACH = (HDR_FCC + 7)
-#endif
};
#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[] = {
- "From: ",
- "To: ",
- "Cc: ",
- "Bcc: ",
- "Subject: ",
- "Reply-To: ",
- "Fcc: "
-#ifdef USE_NNTP
-#ifdef MIXMASTER
- , ""
-#endif
- , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
-#endif
-};
-
-static struct mapping_t ComposeHelp[] = {
- {N_("Send"), OP_COMPOSE_SEND_MESSAGE},
- {N_("Abort"), OP_EXIT},
- {"To", OP_COMPOSE_EDIT_TO},
- {"CC", OP_COMPOSE_EDIT_CC},
- {"Subj", OP_COMPOSE_EDIT_SUBJECT},
- {N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
- {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
- {N_("Help"), OP_HELP},
- {NULL}
-};
-
-#ifdef USE_NNTP
-static struct mapping_t ComposeNewsHelp[] = {
- {N_("Send"), OP_COMPOSE_SEND_MESSAGE},
- {N_("Abort"), OP_EXIT},
- {"Newsgroups", OP_COMPOSE_EDIT_NEWSGROUPS},
- {"Subj", OP_COMPOSE_EDIT_SUBJECT},
- {N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
- {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
- {N_("Help"), OP_HELP},
- {NULL}
+#define W (getmaxx(main_w) - HDR_XOFFSET)
+
+static const char *Prompts[] = {
+ "From: ",
+ "To: ",
+ "Cc: ",
+ "Bcc: ",
+ "Subject: ",
+ "Reply-To: ",
+ "Fcc: ",
};
-#endif
-static void snd_entry (char *b, size_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);
+static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
+ m_strformat(b, blen, getmaxx(main_w), AttachFormat, mutt_attach_fmt,
+ ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE);
}
-#include "mutt_crypt.h"
-
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))
- mvaddstr (HDR_CRYPT, SW, " S/MIME: ");
- else if ((WithCrypto & APPLICATION_PGP))
- mvaddstr (HDR_CRYPT, SW, " PGP: ");
- else
- return;
+ if (!msg->security)
+ mvwaddstr (main_w, HDR_CRYPT, 0, " Security: ");
+ else if (msg->security & APPLICATION_SMIME)
+ mvwaddstr (main_w, HDR_CRYPT, 0, " S/MIME: ");
+ else if (msg->security & APPLICATION_PGP)
+ mvwaddstr (main_w, HDR_CRYPT, 0, " PGP: ");
if ((msg->security & (ENCRYPT | SIGN)) == (ENCRYPT | SIGN))
- addstr (_("Sign, Encrypt"));
+ waddstr (main_w, _("Sign, Encrypt"));
else if (msg->security & ENCRYPT)
- addstr (_("Encrypt"));
+ waddstr (main_w, _("Encrypt"));
else if (msg->security & SIGN)
- addstr (_("Sign"));
+ waddstr (main_w, _("Sign"));
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)"));
- }
- clrtoeol ();
+ waddstr (main_w, _("Clear"));
+
+ if ((msg->security & APPLICATION_PGP)
+ && (msg->security & (ENCRYPT | SIGN))) {
+ if ((msg->security & INLINE))
+ waddstr (main_w, _(" (inline)"));
+ else
+ waddstr (main_w, _(" (PGP/MIME)"));
+ }
+ wclrtoeol (main_w);
- move (HDR_CRYPTINFO, SW);
- clrtoeol ();
- if ((WithCrypto & APPLICATION_PGP)
- && msg->security & APPLICATION_PGP && msg->security & SIGN)
- printw ("%s%s", _(" sign as: "),
+ wmove (main_w, HDR_CRYPTINFO, 0);
+ wclrtoeol (main_w);
+ if (msg->security & APPLICATION_PGP && msg->security & SIGN)
+ wprintw (main_w, "%s%s", _(" sign as: "),
PgpSignAs ? PgpSignAs : _("<default>"));
- if ((WithCrypto & APPLICATION_SMIME)
- && msg->security & APPLICATION_SMIME && msg->security & SIGN) {
- printw ("%s%s", _(" sign as: "),
+ if (msg->security & APPLICATION_SMIME && msg->security & SIGN) {
+ wprintw (main_w, "%s%s", _(" sign as: "),
SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
}
- 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: "),
+ mvwprintw (main_w, HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
NONULL (SmimeCryptAlg));
off = 20;
}
}
-
-#ifdef MIXMASTER
-
-static void redraw_mix_line (LIST * chain)
-{
- int c;
- char *t;
-
- mvaddstr (HDR_MIX, SW, " Mix: ");
-
- if (!chain) {
- addstr ("<no chain defined>");
- clrtoeol ();
- return;
- }
-
- for (c = 12; chain; chain = chain->next) {
- t = chain->data;
- if (t && t[0] == '0' && t[1] == '\0')
- t = "<random>";
-
- if (c + str_len (t) + 2 >= COLS - SW)
- break;
-
- addstr (NONULL (t));
- if (chain->next)
- addstr (", ");
-
- c += str_len (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++) {
- 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);
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, SW, TITLE_FMT, Prompts[line - 1]);
- mutt_paddstr (W, buf);
+ rfc822_addrcat(buf, sizeof (buf), addr, 1);
+ mvwprintw (main_w, line, 0, TITLE_FMT, Prompts[line - 1]);
+ mutt_paddstr (main_w, W, buf);
}
static void draw_envelope (HEADER * msg, char *fcc)
{
draw_envelope_addr (HDR_FROM, msg->env->from);
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND)) {
-#endif
- draw_envelope_addr (HDR_TO, msg->env->to);
- draw_envelope_addr (HDR_CC, msg->env->cc);
- draw_envelope_addr (HDR_BCC, msg->env->bcc);
-#ifdef USE_NNTP
- }
- 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]);
- mutt_paddstr (W, NONULL (msg->env->followup_to));
- if (option (OPTXCOMMENTTO)) {
- mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]);
- mutt_paddstr (W, NONULL (msg->env->x_comment_to));
- }
- }
-#endif
- mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
- mutt_paddstr (W, NONULL (msg->env->subject));
+ draw_envelope_addr (HDR_TO, msg->env->to);
+ draw_envelope_addr (HDR_CC, msg->env->cc);
+ draw_envelope_addr (HDR_BCC, msg->env->bcc);
+ mvwprintw (main_w, HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
+ mutt_paddstr (main_w, W, NONULL (msg->env->subject));
draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
- mvprintw (HDR_FCC, SW, TITLE_FMT, Prompts[HDR_FCC - 1]);
- mutt_paddstr (W, fcc);
-
- if (WithCrypto)
- redraw_crypt_lines (msg);
+ mvwprintw (main_w, HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
+ mutt_paddstr (main_w, W, fcc);
-#ifdef MIXMASTER
- redraw_mix_line (msg->chain);
-#endif
+ redraw_crypt_lines (msg);
- SETCOLOR (MT_COLOR_STATUS);
- mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
- BKGDSET (MT_COLOR_STATUS);
- clrtoeol ();
+ SETCOLOR(main_w, MT_COLOR_STATUS);
+ mvwaddstr (main_w, HDR_ATTACH - 1, 0, _("-- Attachments"));
+ BKGDSET(main_w, MT_COLOR_STATUS);
+ wclrtoeol (main_w);
- BKGDSET (MT_COLOR_NORMAL);
- SETCOLOR (MT_COLOR_NORMAL);
+ BKGDSET(main_w, MT_COLOR_NORMAL);
+ SETCOLOR(main_w, 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;
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) {
- rfc822_free_address (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) {
mutt_error (_("Warning: '%s' is a bad IDN."), err);
mutt_refresh ();
- mem_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 + SW);
- mutt_paddstr (W, buf);
+ rfc822_addrcat(buf, sizeof (buf), *addr, 1);
+ wmove (main_w, line, HDR_XOFFSET);
+ mutt_paddstr (main_w, W, buf);
return 0;
}
mutt_error _("You may not delete the only attachment.");
idx[x]->content->tagged = 0;
- return (-1);
+ return -1;
}
for (y = 0; y < *idxlen; y++) {
idx[x]->content->next = NULL;
idx[x]->content->parts = NULL;
- mutt_free_body (&(idx[x]->content));
- mem_free (&idx[x]->tree);
- mem_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);
}
-/*
+/*
* 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;
/*
* 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) {
case 'h': /* hostname */
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL (Hostname));
+ snprintf (buf, buflen, fmt, NONULL(mod_core.shorthost));
break;
case 'l': /* approx length of current message in bytes */
break;
case 'v':
- strncpy (buf, mutt_make_version (0), buflen);
+ m_strcpy(buf, buflen, mutt_make_version());
break;
case 0:
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);
}
-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);
- mutt_FormatString (buf, w, p, compose_format_str,
- (unsigned long) menu, 0);
+ m_strformat(buf, buflen, getmaxx(main_w), p, compose_format_str, menu, 0);
}
-
/* return values:
*
* 1 message should be postponed
*/
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];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
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;
int oldSort, oldSortAux;
struct stat st;
-#ifdef USE_NNTP
- int news = 0; /* is it a news article ? */
-
- if (option (OPTNEWSSEND))
- news++;
-#endif
-
mutt_attach_init (msg->content);
idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, 1);
menu->make_entry = snd_entry;
menu->tag = mutt_tag_attach;
menu->data = idx;
-#ifdef USE_NNTP
- if (news)
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE,
- ComposeNewsHelp);
- else
-#endif
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE,
- ComposeHelp);
- if (option (OPTMBOXPANE))
- buffy_check (0);
while (loop) {
-#ifdef USE_NNTP
- unset_option (OPTNEWS); /* for any case */
-#endif
switch (op = mutt_menuLoop (menu)) {
case OP_REDRAW:
draw_envelope (msg, fcc);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_TO:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
+ menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_BCC:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
+ menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_CC:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
- break;
-#ifdef USE_NNTP
- case OP_COMPOSE_EDIT_NEWSGROUPS:
- if (news) {
- if (msg->env->newsgroups)
- strfcpy (buf, msg->env->newsgroups, sizeof (buf));
- else
- buf[0] = 0;
- if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- mem_free (&msg->env->newsgroups);
- str_skip_trailws (buf);
- msg->env->newsgroups = str_dup (str_skip_initws (buf));
- move (HDR_TO, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->newsgroups)
- printw ("%-*.*s", W, W, msg->env->newsgroups);
- }
- }
- break;
-
- case OP_COMPOSE_EDIT_FOLLOWUP_TO:
- if (news) {
- buf[0] = 0;
- if (msg->env->followup_to)
- strfcpy (buf, msg->env->followup_to, sizeof (buf));
- if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- mem_free (&msg->env->followup_to);
- str_skip_trailws (buf);
- msg->env->followup_to = str_dup (str_skip_initws (buf));
- move (HDR_CC, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->followup_to)
- printw ("%-*.*s", W, W, msg->env->followup_to);
- }
- }
- break;
-
- case OP_COMPOSE_EDIT_X_COMMENT_TO:
- if (news && option (OPTXCOMMENTTO)) {
- buf[0] = 0;
- if (msg->env->x_comment_to)
- strfcpy (buf, msg->env->x_comment_to, sizeof (buf));
- if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- mem_free (&msg->env->x_comment_to);
- msg->env->x_comment_to = str_dup (buf);
- move (HDR_BCC, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->x_comment_to)
- printw ("%-*.*s", W, W, msg->env->x_comment_to);
- }
- }
+ menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-#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) {
- str_replace (&msg->env->subject, buf);
- move (HDR_SUBJECT, HDR_XOFFSET + SW);
- clrtoeol ();
+ m_strreplace(&msg->env->subject, buf);
+ wmove (main_w, HDR_SUBJECT, HDR_XOFFSET);
+ wclrtoeol (main_w);
if (msg->env->subject)
- mutt_paddstr (W, msg->env->subject);
+ mutt_paddstr (main_w, W, msg->env->subject);
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
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 + SW);
- mutt_paddstr (W, fcc);
+ wmove (main_w, HDR_FCC, HDR_XOFFSET);
+ mutt_paddstr (main_w, W, fcc);
fccSet = 1;
}
MAYBE_REDRAW (menu->redraw);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
- if (Editor && (str_cmp ("builtin", Editor) != 0)
- && !option (OPTEDITHDRS)) {
- mutt_edit_file (Editor, msg->content->filename);
+ if (!option (OPTEDITHDRS)) {
+ mutt_edit_file(msg->content->filename);
mutt_update_encoding (msg->content);
menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
/* fall through */
case OP_COMPOSE_EDIT_HEADERS:
- if (str_cmp ("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);
+ mutt_edit_headers(msg->content->filename, msg, fcc, fcclen);
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
- mem_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++)
- mem_free (&idx[i]);
+ p_delete(&idx[i]);
idxlen = 0;
idx =
mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0,
menu->redraw = REDRAW_FULL;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
-
-
- case OP_COMPOSE_ATTACH_KEY:
- if (!(WithCrypto & APPLICATION_PGP))
- break;
- if (idxlen == idxmax) {
- mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
- menu->data = idx;
- }
-
- idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
- if ((idx[idxlen]->content =
- crypt_pgp_make_key_attachment (NULL)) != NULL) {
- update_idx (menu, idx, idxlen++);
- menu->redraw |= REDRAW_INDEX;
- }
- else
- mem_free (&idx[idxlen]);
-
- menu->redraw |= REDRAW_STATUS;
-
- if (option (OPTNEEDREDRAW)) {
- menu->redraw = REDRAW_FULL;
- unset_option (OPTNEEDREDRAW);
- }
-
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
+ break;
case OP_COMPOSE_ATTACH_FILE:
{
- char *prompt, **files;
+ const char *prompt;
+ char **files;
int error, numfiles;
fname[0] = 0;
break;
if (idxlen + numfiles >= idxmax) {
- mem_realloc (&idx,
- sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles));
+ p_realloc(&idx, idxmax += 5 + numfiles);
menu->data = idx;
}
for (i = 0; i < numfiles; i++) {
char *att = files[i];
- idx[idxlen] = (ATTACHPTR *) mem_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)
else {
error = 1;
mutt_error (_("Unable to attach %s!"), att);
- mem_free (&idx[idxlen]);
+ p_delete(&idx[idxlen]);
}
}
- mem_free (&files);
+ p_delete(&files);
if (!error)
mutt_clear_error ();
break;
case OP_COMPOSE_ATTACH_MESSAGE:
-#ifdef USE_NNTP
- case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
-#endif
{
- char *prompt;
+ const char *prompt;
HEADER *h;
fname[0] = 0;
prompt = _("Open mailbox to attach message from");
-#ifdef USE_NNTP
- unset_option (OPTNEWS);
- if (op == OP_COMPOSE_ATTACH_NEWS_MESSAGE) {
- if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)))
- break;
-
- prompt = _("Open newsgroup to attach message from");
- set_option (OPTNEWS);
- }
-#endif
if (Context)
-#ifdef USE_NNTP
- 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);
}
== -1 || !fname[0])
break;
-#ifdef USE_NNTP
- if (option (OPTNEWS))
- nntp_expand_path (fname, sizeof (fname),
- &CurrentNewsSrv->conn->account);
- 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
+ mutt_expand_path (fname, sizeof (fname));
+ if (mx_get_magic (fname) != M_IMAP && mx_get_magic (fname) != M_POP) {
/* check to make sure the file exists and is readable */
- if (access (fname, R_OK) == -1) {
- mutt_perror (fname);
- break;
- }
+ if (access (fname, R_OK) == -1) {
+ mutt_perror (fname);
+ break;
+ }
+ }
menu->redraw = REDRAW_FULL;
if (!ctx->msgcount) {
mx_close_mailbox (ctx, NULL);
- mem_free (&ctx);
+ p_delete(&ctx);
mutt_error _("No messages in that folder.");
-
break;
}
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) {
}
if (idxlen + Context->tagged >= idxmax) {
- mem_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 *) mem_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!");
-
- mem_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);
- mem_free (&Context);
+ p_delete(&Context);
/* go back to the folder we started from */
Context = this;
/* Restore old $sort and $sort_aux */
Sort = oldSort;
SortAux = oldSortAux;
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_DELETE:
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) {
- 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);
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) {
break;
}
-
-#ifdef MIXMASTER
- if (msg->chain && mix_check_message (msg) != 0)
- break;
-#endif
-
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
_("Save a copy of this message?"))) == -1)
case OP_COMPOSE_EDIT_FILE:
CHECK_COUNT;
- mutt_edit_file (NONULL (Editor), idx[menu->current]->content->filename);
+ mutt_edit_file(idx[menu->current]->content->filename);
mutt_update_encoding (idx[menu->current]->content);
menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
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;
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]) {
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)
int itype;
FILE *fp;
- CLEARLINE (LINES - 1);
fname[0] = 0;
if (mutt_get_field (_("New file: "), fname, sizeof (fname), M_FILE)
!= 0 || !fname[0])
continue;
}
if (idxlen == idxmax) {
- mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
+ p_realloc(&idx, idxmax += 5);
menu->data = idx;
}
- idx[idxlen] = (ATTACHPTR *) mem_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);
- mem_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
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;
idx[idxlen]->content->parts = NULL;
if (idx[idxlen]->unowned)
idx[idxlen]->content->unlink = 0;
- mutt_free_body (&idx[idxlen]->content);
- mem_free (&idx[idxlen]->tree);
- mem_free (&idx[idxlen]);
+ body_list_wipe(&idx[idxlen]->content);
+ p_delete(&idx[idxlen]->tree);
+ p_delete(&idx[idxlen]);
}
- mem_free (&idx);
+ p_delete(&idx);
idxlen = 0;
idxmax = 0;
r = -1;
r = 1;
break;
- case OP_COMPOSE_ISPELL:
- endwin ();
- snprintf (buf, sizeof (buf), "%s -x %s", NONULL (Ispell),
- msg->content->filename);
- if (mutt_system (buf) == -1)
- mutt_error (_("Error running \"%s\"!"), buf);
- else {
- mutt_update_encoding (msg->content);
- menu->redraw |= REDRAW_STATUS;
- }
- break;
-
case OP_COMPOSE_WRITE_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)
if (msg->content->next)
msg->content = mutt_make_multipart (msg->content);
- if (mutt_write_fcc (NONULL (fname), msg, NULL, 1, NULL) < 0)
+ if (mutt_write_fcc (fname, msg, NULL, 1, NULL) < 0)
msg->content = mutt_remove_multipart (msg->content);
else
mutt_message _("Message written.");
}
break;
-
-
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 ();
}
msg->security = 0;
}
- msg->security = crypt_pgp_send_menu (msg, &menu->redraw);
+ msg->security = crypt_send_menu (msg, &menu->redraw, 0);
redraw_crypt_lines (msg);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
- case OP_FORGET_PASSPHRASE:
- crypt_forget_passphrase ();
- break;
-
-
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 ();
}
msg->security = 0;
}
- msg->security = crypt_smime_send_menu (msg, &menu->redraw);
+ msg->security = crypt_send_menu(msg, &menu->redraw, 1);
redraw_crypt_lines (msg);
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 */
if (menu->redraw & REDRAW_STATUS) {
compose_status_line (buf, sizeof (buf), menu, NONULL (ComposeFormat));
- CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
- SETCOLOR (MT_COLOR_STATUS);
- move (option (OPTSTATUSONTOP) ? 0 : LINES - 2, SW);
- printw ("%-*.*s", COLS-SW, COLS-SW, buf);
- SETCOLOR (MT_COLOR_NORMAL);
+ CLEARLINE(main_w, 0);
+ SETCOLOR(main_w, MT_COLOR_STATUS);
+ mvwprintw (main_w, 0, 0, "%-*.*s", getmaxx(main_w), getmaxx(main_w), buf);
+ SETCOLOR(main_w, MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
}
}
msg->content = idx[0]->content;
for (i = 0; i < idxlen; i++) {
idx[i]->content->aptr = NULL;
- mem_free (&idx[i]);
+ p_delete(&idx[i]);
}
- }
- else
+ } else {
msg->content = NULL;
+ }
- mem_free (&idx);
+ p_delete(&idx);
return (r);
}