mappings as standalone module

[apps/madmutt.git] / recvcmd.c

diff --git a/recvcmd.c b/recvcmd.c
index e6d54f9..7cd9a16 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -11,20 +11,26 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
 #include "mutt.h"
+#include "enter.h"
+#include "state.h"
+#include "handler.h"
+#include "recvattach.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "mime.h"
 #include "attach.h"
-#include "mapping.h"
 #include "mx.h"
 #include "copy.h"
 #include "mutt_idna.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 /* some helper functions to verify that we are exclusively operating
  * on message/rfc822 attachments
@@ -130,9 +136,9 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   p = (cur || count_tagged (idx, idxlen) == 1);
 
   if (p)
-    strfcpy (prompt, _("Bounce message to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce message to: "));
   else
-    strfcpy (prompt, _("Bounce tagged messages to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce tagged messages to: "));
 
   buf[0] = '\0';
   if (mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS)
@@ -149,7 +155,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
 
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
-    FREE (&err);
+    p_delete(&err);
     rfc822_free_address (&adr);
     return;
   }
@@ -169,10 +175,10 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
     mutt_format_string (prompt, sizeof (prompt) - 4,
                         0, COLS - extra_space, 0, 0,
                         prompt, sizeof (prompt), 0);
-    safe_strcat (prompt, sizeof (prompt), "...?");
+    m_strcat(prompt, sizeof(prompt), "...?");
+  } else {
+    m_strcat(prompt, sizeof(prompt), "?");
   }
-  else
-    safe_strcat (prompt, sizeof (prompt), "?");
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     rfc822_free_address (&adr);
@@ -310,12 +316,12 @@ static void include_header (int quote, FILE * ifp,
 
   if (quote) {
     if (_prefix)
-      strfcpy (prefix, _prefix, sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), _prefix);
     else if (!option (OPTTEXTFLOWED))
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
                          Context, hdr, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
 
     chflags |= CH_PREFIX;
   }
@@ -400,7 +406,7 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
                          parent, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
   }
 
   include_header (option (OPTFORWQUOTE), fp, parent, tmpfp, prefix);
@@ -439,7 +445,7 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
 
   /* initialize a state structure */
 
-  memset (&st, 0, sizeof (st));
+  p_clear(&st, 1);
 
   if (option (OPTFORWQUOTE))
     st.prefix = prefix;
@@ -683,8 +689,8 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
   if ((flags & SENDNEWS)) {
     /* in case followup set Newsgroups: with Followup-To: if it present */
     if (!env->newsgroups && curenv &&
-        safe_strcasecmp (curenv->followup_to, "poster"))
-      env->newsgroups = safe_strdup (curenv->followup_to);
+        m_strcasecmp(curenv->followup_to, "poster"))
+      env->newsgroups = m_strdup(curenv->followup_to);
   }
   else
 #endif
@@ -824,7 +830,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   else {
     mutt_make_attribution (Context, parent, tmpfp);
 
-    memset (&st, 0, sizeof (STATE));
+    p_clear(&st, 1);
     st.fpin = fp;
     st.fpout = tmpfp;
 
@@ -832,7 +838,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
                          Context, parent, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
 
     st.prefix = prefix;
     st.flags = M_CHARCONV;