X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=f5fe28b906f62faa2bb291df26f28df774bcf63a;hp=68ad4623dd5aa82cd661b4f1cc9d951bb7266813;hb=c660c8cbae7f647c637502779862e4a36ad6a074;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/recvcmd.c b/recvcmd.c
index 68ad462..f5fe28b 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -14,6 +14,10 @@
 #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 <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -23,9 +27,7 @@
 #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"
@@ -135,9 +137,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)
@@ -174,10 +176,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);
@@ -315,12 +317,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;
   }
@@ -405,7 +407,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);
@@ -688,7 +690,7 @@ 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 &&
-        str_casecmp (curenv->followup_to, "poster"))
+        m_strcasecmp(curenv->followup_to, "poster"))
       env->newsgroups = m_strdup(curenv->followup_to);
   }
   else
@@ -837,7 +839,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;