exit strfcpy, only use m_strcpy.

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index bc84b6b..c827e7e 100644 (file)
--- a/send.c
+++ b/send.c
@@ -214,7 +214,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
 #ifdef USE_NNTP
   if (option (OPTNEWSSEND)) {
     if (en->newsgroups)
-      strfcpy (buf, en->newsgroups, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->newsgroups);
     else
       buf[0] = 0;
     if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
@@ -223,7 +223,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     en->newsgroups = m_strdup(buf);
 
     if (en->followup_to)
-      strfcpy (buf, en->followup_to, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->followup_to);
     else
       buf[0] = 0;
     if (option (OPTASKFOLLOWUP)
@@ -233,7 +233,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     en->followup_to = m_strdup(buf);
 
     if (en->x_comment_to)
-      strfcpy (buf, en->x_comment_to, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->x_comment_to);
     else
       buf[0] = 0;
     if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
@@ -257,7 +257,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     if (option (OPTFASTREPLY))
       return (0);
     else
-      strfcpy (buf, en->subject, sizeof (buf));
+      m_strcpy(buf, sizeof(buf), en->subject);
   }
   else {
     char *p;
@@ -267,7 +267,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
       if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
         p = uh->data + 8;
         SKIPWS (p);
-        strncpy (buf, p, sizeof (buf));
+        m_strcpy(buf, sizeof(buf), p);
       }
     }
   }
@@ -751,7 +751,7 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags)
     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