X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=a3476a801336174307fcb70862fbac85594362d5;hp=1102be8fa31de54aa5c335f40939311c0c9a0bf7;hb=c8bf978fc5c4f6c793620a515fa2456a3fa9eb13;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/headers.c b/headers.c
index 1102be8..a3476a8 100644
--- a/headers.c
+++ b/headers.c
@@ -11,11 +11,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
+
 #include "mutt.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <sys/stat.h>
@@ -126,10 +129,9 @@ void mutt_edit_headers (const char *editor,
      * message based upon this one.
      */
     if (fcc && ascii_strncasecmp ("fcc:", cur->data, 4) == 0) {
-      p = cur->data + 4;
-      SKIPWS (p);
+      p = vskipspaces(cur->data + 4);
       if (*p) {
-        strfcpy (fcc, p, fcclen);
+        m_strcpy(fcc, fcclen, p);
         mutt_pretty_mailbox (fcc);
       }
       keep = 0;
@@ -139,18 +141,17 @@ void mutt_edit_headers (const char *editor,
       BODY *parts;
       char *q;
 
-      p = cur->data + 7;
-      SKIPWS (p);
+      p = vskipspaces(cur->data + 7);
       if (*p) {
         if ((q = strpbrk (p, " \t"))) {
-          str_substrcpy (path, p, q, sizeof (path));
-          SKIPWS (q);
+          str_substrcpy(path, p, q, sizeof(path));
+          q = vskipspaces(q);
         }
         else
-          strfcpy (path, p, sizeof (path));
+          m_strcpy(path, sizeof(path), p);
         mutt_expand_path (path, sizeof (path));
         if ((body = mutt_make_file_attach (path))) {
-          body->description = safe_strdup (q);
+          body->description = m_strdup(q);
           for (parts = msg->content; parts->next; parts = parts->next);
           parts->next = body;
         }