X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=3ffd8197c85b8036d6a5a7abf955fe0be061f3e3;hp=031e2a93602446b50798649e66c2c62a80ac7d79;hb=b934795055e8c16e6cb7c9687a4dce815cb300e6;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/headers.c b/headers.c
index 031e2a9..3ffd819 100644
--- a/headers.c
+++ b/headers.c
@@ -12,10 +12,11 @@
 #endif
 
 #include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
-#include "ascii.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
 #include "lib/debug.h"
@@ -128,33 +129,31 @@ 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;
     }
     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
-          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 = 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);
@@ -165,8 +164,7 @@ void mutt_edit_headers (const char *editor,
     }
 
 
-    else if ((WithCrypto & APPLICATION_PGP)
-             && ascii_strncasecmp ("pgp:", cur->data, 4) == 0) {
+    else if (ascii_strncasecmp("pgp:", cur->data, 4) == 0) {
       msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
       if (msg->security)
         msg->security |= APPLICATION_PGP;