X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=recvcmd.c;h=fec63fe83b307a0cd5856f8db178fbfee3fb5fe2;hb=b07d69b15852a06183f7b2298436e18150c36958;hp=5606c288027c9590b58d8e16b7665ef594456be2;hpb=617e7d83d14e14e6a520a48e75437211b16c8834;p=apps%2Fmadmutt.git

diff --git a/recvcmd.c b/recvcmd.c
index 5606c28..fec63fe 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -12,6 +12,9 @@
 #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"
@@ -28,8 +31,6 @@
 #include "copy.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 /* some helper functions to verify that we are exclusively operating
  * on message/rfc822 attachments
@@ -174,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);
-    str_cat (prompt, sizeof (prompt), "...?");
+    m_strcat(prompt, sizeof(prompt), "...?");
+  } else {
+    m_strcat(prompt, sizeof(prompt), "?");
   }
-  else
-    str_cat (prompt, sizeof (prompt), "?");
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     rfc822_free_address (&adr);
@@ -444,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;
@@ -689,7 +690,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
     /* in case followup set Newsgroups: with Followup-To: if it present */
     if (!env->newsgroups && curenv &&
         str_casecmp (curenv->followup_to, "poster"))
-      env->newsgroups = str_dup (curenv->followup_to);
+      env->newsgroups = m_strdup(curenv->followup_to);
   }
   else
 #endif
@@ -829,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;