X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=bb99448bbc5da0c1010bf500c8c84519475c7f8a;hp=f73fa4e29f1f224181cf00564bb042d022f4641e;hb=81884ccb464c69a8dba9de1b97af261a8a02b2c7;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199

diff --git a/postpone.c b/postpone.c
index f73fa4e..bb99448 100644
--- a/postpone.c
+++ b/postpone.c
@@ -16,6 +16,7 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -297,8 +298,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       if (ctx) {
         /* if a mailbox is currently open, look to see if the orignal message
            the user attempted to reply to is in this mailbox */
-        p = tmp->data + 18;
-        SKIPWS (p);
+        p = vskipspaces(tmp->data + 18);
         if (!ctx->id_hash)
           ctx->id_hash = mutt_make_id_hash (ctx);
         *cur = hash_find (ctx->id_hash, p);
@@ -317,9 +317,8 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
         code |= SENDREPLY;
     }
     else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
-      p = tmp->data + 11;
-      SKIPWS (p);
-      strfcpy (fcc, p, fcclen);
+      p = vskipspaces(tmp->data + 11);
+      m_strcpy(fcc, fcclen, p);
       mutt_pretty_mailbox (fcc);
 
       /* remove the X-Mutt-Fcc: header field */
@@ -333,10 +332,10 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       tmp = next;
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && (str_ncmp ("Pgp:", tmp->data, 4) == 0       /* this is generated
+             && (m_strncmp("Pgp:", tmp->data, 4) == 0       /* this is generated
                                                                  * by old mutt versions
                                                                  */
-                 || str_ncmp ("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+                 || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
       hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
       hdr->security |= APPLICATION_PGP;
 
@@ -351,7 +350,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       tmp = next;
     }
     else if ((WithCrypto & APPLICATION_SMIME)
-             && str_ncmp ("X-Mutt-SMIME:", tmp->data, 13) == 0) {
+             && m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
       hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
       hdr->security |= APPLICATION_SMIME;
 
@@ -367,7 +366,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
     }
 
 #ifdef MIXMASTER
-    else if (str_ncmp ("X-Mutt-Mix:", tmp->data, 11) == 0) {
+    else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
       char *t;
 
       mutt_free_list (&hdr->chain);
@@ -408,8 +407,7 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
   if (!WithCrypto)
     return 0;
 
-  SKIPWS (p);
-  for (; *p; p++) {
+  for (p = vskipspaces(p); *p; p++) {
 
     switch (*p) {
     case 'e':
@@ -511,7 +509,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   int rv = -1;
   STATE s;
 
-  memset (&s, 0, sizeof (s));
+  p_clear(&s, 1);
 
   if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
     return (-1);
@@ -610,7 +608,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
 
     file[0] = '\0';
     if (b->filename) {
-      strfcpy (file, b->filename, sizeof (file));
+      m_strcpy(file, sizeof(file), b->filename);
       b->d_filename = m_strdup(b->filename);
     }
     else {