X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc822.c;h=cbe5ba43d4651619b860786c02e6f2d5452a1e01;hp=25aa1c420512f2d050d4b2d261684bf28774ab29;hb=207c707f2c7073a6fbd14124197a559d9d471f65;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/rfc822.c b/rfc822.c
index 25aa1c4..cbe5ba4 100644
--- a/rfc822.c
+++ b/rfc822.c
@@ -17,10 +17,10 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "mutt_idna.h"
 
 
@@ -473,10 +473,10 @@ rfc822_cat (char *buf, size_t buflen, const char *value, const char *specials)
     }
     *pc++ = '"';
     *pc = 0;
-    strfcpy (buf, tmp, buflen);
+    m_strcpy(buf, buflen, tmp);
   }
   else
-    strfcpy (buf, value, buflen);
+    m_strcpy(buf, buflen, value);
 }
 
 void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
@@ -517,7 +517,7 @@ void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
     else {
       if (!buflen)
         goto done;
-      strfcpy (pbuf, addr->personal, buflen);
+      m_strcpy(pbuf, buflen, addr->personal);
       len = m_strlen(pbuf);
       pbuf += len;
       buflen -= len;
@@ -540,11 +540,11 @@ void rfc822_write_address_single (char *buf, size_t buflen, ADDRESS * addr,
     if (!buflen)
       goto done;
     if (ascii_strcmp (addr->mailbox, "@") && !display) {
-      strfcpy (pbuf, addr->mailbox, buflen);
+      m_strcpy(pbuf, buflen, addr->mailbox);
       len = m_strlen(pbuf);
     }
     else if (ascii_strcmp (addr->mailbox, "@") && display) {
-      strfcpy (pbuf, mutt_addr_for_display (addr), buflen);
+      m_strcpy(pbuf, buflen, mutt_addr_for_display(addr));
       len = m_strlen(pbuf);
     }
     else {