X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=8175f6f396739b44762684c9e8c00692bf8c0ce5;hp=5f737b74fa649e737ddee32e3b51e081c091c7db;hb=b36dc16c428cc2b1371bb99c0581aa014f302791;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/parse.c b/parse.c
index 5f737b7..8175f6f 100644
--- a/parse.c
+++ b/parse.c
@@ -17,13 +17,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"
-#include "mime.h"
 #include "rfc2047.h"
-#include "rfc2231.h"
 #include "mutt_crypt.h"
 #include "url.h"
 
@@ -194,8 +194,7 @@ static PARAMETER *parse_parameters (const char *s)
       while (ISSPACE (new->attribute[--i]))
         new->attribute[i] = 0;
 
-      s = p + 1;                /* skip over the = */
-      SKIPWS (s);
+      s = vskipspaces(p + 1);     /* skip over the = */
 
       if (*s == '"') {
         int state_ascii = 1;
@@ -257,10 +256,8 @@ static PARAMETER *parse_parameters (const char *s)
       break;                    /* no more parameters */
 
     do {
-      s++;
-
       /* Move past any leading whitespace */
-      SKIPWS (s);
+      s = vskipspaces(s + 1);
     }
     while (*s == ';');          /* skip empty parameters */
   }
@@ -396,11 +393,9 @@ static void parse_content_disposition (char *s, BODY * ct)
 
   /* Check to see if a default filename was given */
   if ((s = strchr (s, ';')) != NULL) {
-    s++;
-    SKIPWS (s);
-    if ((s =
-         mutt_get_parameter ("filename",
-                             (parms = parse_parameters (s)))) != 0)
+    s = vskipspaces(s + 1);
+    if ((s = mutt_get_parameter("filename",
+                                (parms = parse_parameters (s)))) != 0)
       str_replace (&ct->filename, s);
     if ((s = mutt_get_parameter ("name", parms)) != 0)
       ct->form_name = m_strdup(s);
@@ -431,9 +426,8 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
   while (*(line = mutt_read_rfc822_line (fp, line, &linelen)) != 0) {
     /* Find the value of the current header */
     if ((c = strchr (line, ':'))) {
-      *c = 0;
-      c++;
-      SKIPWS (c);
+      *c++ = 0;
+      c = vskipspaces(c);
       if (!*c) {
         debug_print (1, ("skipping empty header field: %s\n", line));
         continue;
@@ -668,8 +662,7 @@ static const char *uncomment_timezone (char *buf, size_t buflen,
 
   if (*tz != '(')
     return tz;                  /* no need to do anything */
-  tz++;
-  SKIPWS (tz);
+  tz = vskipspaces(tz + 1);
   if ((p = strpbrk (tz, " )")) == NULL)
     return tz;
   len = p - tz;
@@ -796,14 +789,14 @@ time_t mutt_parse_date (const char *s, HEADER * h)
    * the date format imposes a natural limit.
    */
 
-  strfcpy (scratch, s, sizeof (scratch));
+  m_strcpy(scratch, sizeof(scratch), s);
 
   /* kill the day of the week, if it exists. */
   if ((t = strchr (scratch, ',')))
     t++;
   else
     t = scratch;
-  SKIPWS (t);
+  t = vskipspaces(t);
 
   p_clear(&tm, 1);
 
@@ -1043,7 +1036,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     else if (!m_strcasecmp(line + 1, "ollowup-to")) {
       if (!e->followup_to) {
         str_skip_trailws (p);
-        e->followup_to = m_strdup(str_skip_initws (p));
+        e->followup_to = m_strdup(vskipspaces(p));
       }
       matched = 1;
     }
@@ -1126,7 +1119,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     if (!m_strcasecmp(line + 1, "ewsgroups")) {
       p_delete(&e->newsgroups);
       str_skip_trailws (p);
-      e->newsgroups = m_strdup(str_skip_initws (p));
+      e->newsgroups = m_strdup(vskipspaces(p));
       matched = 1;
     }
     break;
@@ -1378,9 +1371,8 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
       }
     }
 
-    *p = 0;
-    p++;
-    SKIPWS (p);
+    *p++ = 0;
+    p = vskipspaces(p);
     if (!*p)
       continue;                 /* skip empty header fields */
 
@@ -1415,7 +1407,7 @@ ADDRESS *mutt_parse_adrlist (ADDRESS * p, const char *s)
     char tmp[HUGE_STRING];
     char *r;
 
-    strfcpy (tmp, s, sizeof (tmp));
+    m_strcpy(tmp, sizeof(tmp), s);
     r = tmp;
     while ((r = strtok (r, " \t")) != NULL) {
       p = rfc822_parse_adrlist (p, r);