X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=7e74f619119bc170054dddc57767f1a609354fc9;hp=f057003bf28ee834df08c19a862344a270530991;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/compose.c b/compose.c
index f057003..7e74f61 100644
--- a/compose.c
+++ b/compose.c
@@ -11,51 +11,36 @@
  * 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-crypt/crypt.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-ui/curses.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 "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"
+#include <nntp/nntp.h>
 #endif
 
-#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,
@@ -65,10 +50,7 @@ enum {
   HDR_SUBJECT,
   HDR_REPLYTO,
   HDR_FCC,
-
-#ifdef MIXMASTER
   HDR_MIX,
-#endif
 
   HDR_CRYPT,
   HDR_CRYPTINFO,
@@ -92,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
 };
 
@@ -132,33 +111,23 @@ static struct mapping_t ComposeNewsHelp[] = {
 };
 #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);
-}
 
-#include "mutt_crypt.h"
+static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
+  m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
+              ((ATTACHPTR **)menu->data)[num],
+              M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+}
 
 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"));
@@ -169,31 +138,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 : _("<default>"));
 
-  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 : _("<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: "),
@@ -202,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;
@@ -223,26 +185,25 @@ static void redraw_mix_line (LIST * chain)
     if (t && t[0] == '0' && t[1] == '\0')
       t = "<random>";
 
-    if (c + str_len (t) + 2 >= COLS - SW)
+    if (c + m_strlen(t) + 2 >= COLS - SW)
       break;
 
     addstr (NONULL (t));
     if (chain->next)
       addstr (", ");
 
-    c += str_len (t) + 2;
+    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++) {
-    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);
@@ -264,12 +225,12 @@ 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);
+  rfc822_addrcat(buf, sizeof (buf), addr, 1);
   mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
   mutt_paddstr (W, buf);
 }
@@ -284,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]);
@@ -302,12 +262,8 @@ 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);
-
-#ifdef MIXMASTER
+  redraw_crypt_lines (msg);
   redraw_mix_line (msg->chain);
-#endif
 
   SETCOLOR (MT_COLOR_STATUS);
   mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
@@ -318,22 +274,22 @@ 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;
 
   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) {
@@ -344,7 +300,7 @@ static int edit_address_list (int line, ADDRESS ** 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);
 
@@ -362,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++) {
@@ -374,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++)
@@ -397,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;
@@ -441,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) {
@@ -479,7 +436,7 @@ static const char *compose_format_str (char *buf, size_t buflen, char op,
     break;
 
   case 'v':
-    strncpy (buf, mutt_make_version (0), buflen);
+    m_strcpy(buf, buflen, mutt_make_version (0));
     break;
 
   case 0:
@@ -487,27 +444,22 @@ 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);
 }
 
-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, COLS - SW, p, compose_format_str, menu, 0);
 }
 
-
 /* return values:
  *
  * 1	message should be postponed
@@ -516,16 +468,17 @@ 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 helpstr[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;
@@ -555,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);
@@ -614,14 +565,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]) {
           p_delete(&msg->env->newsgroups);
-          str_skip_trailws (buf);
-          msg->env->newsgroups = str_dup (str_skip_initws (buf));
+          m_strrtrim(buf);
+          msg->env->newsgroups = m_strdup(skipspaces(buf));
           move (HDR_TO, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->newsgroups)
@@ -634,12 +585,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]) {
           p_delete(&msg->env->followup_to);
-          str_skip_trailws (buf);
-          msg->env->followup_to = str_dup (str_skip_initws (buf));
+          m_strrtrim(buf);
+          msg->env->followup_to = m_strdup(skipspaces(buf));
           move (HDR_CC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->followup_to)
@@ -652,11 +603,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]) {
           p_delete(&msg->env->x_comment_to);
-          msg->env->x_comment_to = str_dup (buf);
+          msg->env->x_comment_to = m_strdup(buf);
           move (HDR_BCC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->x_comment_to)
@@ -667,11 +618,11 @@ 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) {
-        str_replace (&msg->env->subject, buf);
+        m_strreplace(&msg->env->subject, buf);
         move (HDR_SUBJECT, HDR_XOFFSET + SW);
         clrtoeol ();
         if (msg->env->subject)
@@ -684,9 +635,9 @@ 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 + SW);
         mutt_paddstr (W, fcc);
@@ -696,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 && (str_cmp ("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;
@@ -706,10 +656,10 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       /* 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)))) {
-        const 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,
@@ -719,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 */
@@ -742,13 +685,9 @@ 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 (!(WithCrypto & APPLICATION_PGP))
-        break;
       if (idxlen == idxmax) {
         p_realloc(&idx, idxmax += 5);
         menu->data = idx;
@@ -771,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:
       {
@@ -849,7 +787,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);
           }
 
@@ -864,12 +802,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
@@ -903,7 +837,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) {
@@ -937,7 +871,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);
@@ -995,12 +929,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) {
-        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);
@@ -1047,8 +980,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) {
@@ -1073,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,
@@ -1104,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;
@@ -1135,7 +1057,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]) {
@@ -1148,7 +1070,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)
@@ -1200,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
@@ -1210,7 +1132,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;
 
@@ -1282,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]);
         }
@@ -1325,7 +1247,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)
@@ -1346,13 +1268,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       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 ();
@@ -1365,18 +1282,12 @@ 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 (!(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 ();
@@ -1389,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 */
@@ -1420,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);