X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=d1f2e35a91f1c7126397427b2e2b383d4b2def13;hp=abd9b0f74d8a21b85bfbc1ec1290dab021e6de88;hb=61fec8f6b3bff64d96d016a14729ab1ea2c4a2e8;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/headers.c b/headers.c
index abd9b0f..d1f2e35 100644
--- a/headers.c
+++ b/headers.c
@@ -129,8 +129,7 @@ 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) {
         m_strcpy(fcc, fcclen, p);
         mutt_pretty_mailbox (fcc);
@@ -138,24 +137,23 @@ void mutt_edit_headers (const char *editor,
       keep = 0;
     }
     else if (ascii_strncasecmp ("attach:", cur->data, 7) == 0) {
-      BODY *body;
+      BODY *bbody;
       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);
+          m_strncpy(path, sizeof(path), p, q - p);
+          q = vskipspaces(q);
         }
         else
           m_strcpy(path, sizeof(path), p);
         mutt_expand_path (path, sizeof (path));
-        if ((body = mutt_make_file_attach (path))) {
-          body->description = m_strdup(q);
+        if ((bbody = mutt_make_file_attach (path))) {
+          bbody->description = m_strdup(q);
           for (parts = msg->content; parts->next; parts = parts->next);
-          parts->next = body;
+          parts->next = bbody;
         }
         else {
           mutt_pretty_mailbox (path);