X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=193a122b5757704b84fe7b13c0b7b5b860605731;hp=1c928fa610794d3c895535ac3e1d38d4b2737a71;hb=9eb3b25249e78d778b6d0583b06a7c5615709e63;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199

diff --git a/headers.c b/headers.c
index 1c928fa..193a122 100644
--- a/headers.c
+++ b/headers.c
@@ -11,22 +11,22 @@
 # include "config.h"
 #endif
 
+#include <sys/stat.h>
+#include <string.h>
+#include <ctype.h>
+
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
+#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
 
 #include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
-#include "lib/debug.h"
-
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-
 void mutt_edit_headers (const char *editor,
                         const char *body,
-                        HEADER * msg, char *fcc, size_t fcclen)
+                        HEADER * msg, char *fcc, ssize_t fcclen)
 {
   char path[_POSIX_PATH_MAX];   /* tempfile used to edit headers + body */
   char buffer[LONG_STRING];
@@ -36,7 +36,7 @@ void mutt_edit_headers (const char *editor,
   ENVELOPE *n;
   time_t mtime;
   struct stat st;
-  LIST *cur, **last = NULL, *tmp;
+  string_list_t *cur, **last = NULL, *tmp;
 
   mutt_mktemp (path);
   if ((ofp = safe_fopen (path, "w")) == NULL) {
@@ -76,7 +76,7 @@ void mutt_edit_headers (const char *editor,
   }
 
   mutt_unlink (body);
-  mutt_free_list (&msg->env->userhdrs);
+  string_list_wipe(&msg->env->userhdrs);
 
   /* Read the temp file back in */
   if ((ifp = fopen (path, "r")) == NULL) {
@@ -102,7 +102,7 @@ void mutt_edit_headers (const char *editor,
   n->references = msg->env->references;
   msg->env->references = NULL;
 
-  mutt_free_envelope (&msg->env);
+  envelope_delete(&msg->env);
   msg->env = n;
   n = NULL;
 
@@ -110,7 +110,7 @@ void mutt_edit_headers (const char *editor,
 #ifdef USE_NNTP
     if (!option (OPTNEWSSEND))
 #endif
-      mutt_free_list (&msg->env->references);
+      string_list_wipe(&msg->env->references);
 
   mutt_expand_aliases_env (msg->env);
 
@@ -128,33 +128,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 +163,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;
@@ -182,7 +179,7 @@ void mutt_edit_headers (const char *editor,
       *last = cur->next;
       cur = cur->next;
       tmp->next = NULL;
-      mutt_free_list (&tmp);
+      string_list_wipe(&tmp);
     }
   }
 }