forgotten add.

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index bc84b6b..30db12a 100644 (file)
--- a/send.c
+++ b/send.c
@@ -17,13 +17,14 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_curses.h"
 #include "rfc2047.h"
 #include "rfc3676.h"
 #include "keymap.h"
-#include "mime.h"
 #include "copy.h"
 #include "mx.h"
 #include "mutt_crypt.h"
@@ -214,7 +215,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 +224,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 +234,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 +258,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;
@@ -265,9 +266,8 @@ static int edit_envelope (ENVELOPE * en, int flags)
     buf[0] = 0;
     for (; uh; uh = uh->next) {
       if (ascii_strncasecmp ("subject:", uh->data, 8) == 0) {
-        p = uh->data + 8;
-        SKIPWS (p);
-        strncpy (buf, p, sizeof (buf));
+        p = vskipspaces(uh->data + 8);
+        m_strcpy(buf, sizeof(buf), p);
       }
     }
   }
@@ -303,10 +303,9 @@ static int edit_envelope (ENVELOPE * en, int flags)
 }
 
 #ifdef USE_NNTP
-char *nntp_get_header (const char *s)
+char *nntp_get_header(const char *s)
 {
-  SKIPWS (s);
-  return m_strdup(s);
+    return m_strdup(skipspaces(s));
 }
 #endif
 
@@ -751,7 +750,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