X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=dff5aee3c044997f852d133c5670ec8bd09a6d3d;hp=e6d54f9715b0fa485c2ba5898e9346790de11e6a;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hpb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3

diff --git a/recvcmd.c b/recvcmd.c
index e6d54f9..dff5aee 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -11,7 +11,16 @@
 # 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 "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"
@@ -22,9 +31,6 @@
 #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
@@ -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);
@@ -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;