exit strfcpy, only use m_strcpy.

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index add4d74..1daf044 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -122,15 +122,15 @@ static void encode_quoted (FGETCONV * fc, FILE * fout, int istext)
 
     /* Escape lines that begin with/only contain "the message separator". */
     if (linelen == 4 && !m_strncmp("From", line, 4)) {
-      strfcpy (line, "=46rom", sizeof (line));
+      m_strcpy(line, sizeof(line), "=46rom");
       linelen = 6;
     }
     else if (linelen == 4 && !m_strncmp("from", line, 4)) {
-      strfcpy (line, "=66rom", sizeof (line));
+      m_strcpy(line, sizeof(line), "=66rom");
       linelen = 6;
     }
     else if (linelen == 1 && line[0] == '.') {
-      strfcpy (line, "=2E", sizeof (line));
+      m_strcpy(line, sizeof(line), "=2E");
       linelen = 3;
     }
 
@@ -396,7 +396,7 @@ int mutt_write_mime_body (BODY * a, FILE * f)
 
       return (-1);
     }
-    strfcpy (boundary, p, sizeof (boundary));
+    m_strcpy(boundary, sizeof(boundary), p);
 
     for (t = a->parts; t; t = t->next) {
       fprintf (f, "\n--%s\n", boundary);
@@ -904,13 +904,13 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
       snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir));
       break;
     case 1:
-      strfcpy (buf, SYSCONFDIR "/muttng-mime.types", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), SYSCONFDIR "/muttng-mime.types");
       break;
     case 2:
-      strfcpy (buf, PKGDATADIR "/mime.types", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), PKGDATADIR "/mime.types");
       break;
     case 3:
-      strfcpy (buf, SYSCONFDIR "/mime.types", sizeof (buf));
+      m_strcpy(buf, sizeof(buf), SYSCONFDIR "/mime.types");
       break;
     default:
       debug_print (1, ("Internal error, count = %d.\n", count));
@@ -958,7 +958,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
             str_substrcpy (subtype, p, q, sizeof (subtype));
 
             if ((type = mutt_check_mime_type (ct)) == TYPEOTHER)
-              strfcpy (xtype, ct, sizeof (xtype));
+              m_strcpy(xtype, sizeof(xtype), ct);
 
             cur_sze = sze;
           }
@@ -1162,7 +1162,7 @@ char *mutt_get_body_charset (char *d, size_t dlen, BODY * b)
   if (p)
     mutt_canonical_charset (d, dlen, NONULL (p));
   else
-    strfcpy (d, "us-ascii", dlen);
+    m_strcpy(d, dlen, "us-ascii");
 
   return d;
 }