X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=761be88d38124f58208c02eaafec76ba5de649c2;hp=5d7e0cc1f4bc81ff036b72ac09fe9e8b523c7048;hb=bd28609f1086cc4cae0f44e2520c53b7fed542d0;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199

diff --git a/charset.c b/charset.c
index 5d7e0cc..761be88 100644
--- a/charset.c
+++ b/charset.c
@@ -193,7 +193,7 @@ void mutt_set_langinfo_charset (void)
   char buff[LONG_STRING];
   char buff2[LONG_STRING];
 
-  strfcpy (buff, nl_langinfo (CODESET), sizeof (buff));
+  m_strcpy(buff, sizeof(buff), nl_langinfo(CODESET));
   mutt_canonical_charset (buff2, sizeof (buff2), buff);
 
   /* finally, set $charset */
@@ -226,16 +226,16 @@ void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
   else if (!ascii_strncasecmp (name, "iso8859-", 8))
     snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8);
   else
-    strfcpy (scratch, NONULL (name), sizeof (scratch));
+    m_strcpy(scratch, sizeof(scratch), NONULL(name));
 
   for (i = 0; PreferredMIMENames[i].key; i++)
     if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
-        !str_casecmp (scratch, PreferredMIMENames[i].key)) {
-      strfcpy (dest, PreferredMIMENames[i].pref, dlen);
+        !m_strcasecmp(scratch, PreferredMIMENames[i].key)) {
+      m_strcpy(dest, dlen, PreferredMIMENames[i].pref);
       return;
     }
 
-  strfcpy (dest, scratch, dlen);
+  m_strcpy(dest, dlen, scratch);
 
   /* for cosmetics' sake, transform to lowercase. */
   for (p = dest; *p; p++)
@@ -546,7 +546,7 @@ const char *mutt_get_first_charset (const char *charset)
     return "us-ascii";
   if (!(c1 = strchr (c, ':')))
     return ((char*) charset);
-  strfcpy (fcharset, c, c1 - c + 1);
+  m_strcpy(fcharset, c1 - c + 1, c);
   return fcharset;
 }