X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=cd7886664dc439d6f5e383fd819bf37561163a11;hp=acf362ddbc991457ad2733d78c9f80ae26e9b6bc;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/parse.c b/parse.c
index acf362d..cd78866 100644
--- a/parse.c
+++ b/parse.c
@@ -12,21 +12,20 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
-#include "buffer.h"
 #include "enter.h"
-#include "ascii.h"
 #include "recvattach.h"
 #include "mx.h"
-#include "mime.h"
-#include "rfc2047.h"
-#include "rfc2231.h"
 #include "mutt_crypt.h"
 #include "url.h"
 
-#include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/debug.h"
 
@@ -45,14 +44,14 @@ char *mutt_read_rfc822_line (FILE * f, char *line, size_t * linelen)
   char ch;
   size_t offset = 0;
 
-  FOREVER {
+  for (;;) {
     if (fgets (buf, *linelen - offset, f) == NULL ||    /* end of file or */
         (ISSPACE (*line) && !offset)) { /* end of headers */
       *line = 0;
       return (line);
     }
 
-    buf += str_len (buf) - 1;
+    buf += m_strlen(buf) - 1;
     if (*buf == '\n') {
       /* we did get a full line. remove trailing space */
       while (ISSPACE (*buf))
@@ -101,17 +100,17 @@ LIST *mutt_parse_references (char *s, int in_reply_to)
     new = NULL;
 
     if (*s == '<') {
-      n = str_len (s);
+      n = m_strlen(s);
       if (s[n - 1] != '>') {
         o = s;
         s = NULL;
         continue;
       }
 
-      new = str_dup (s);
+      new = m_strdup(s);
     }
     else if (o) {
-      m = str_len (s);
+      m = m_strlen(s);
       if (s[m - 1] == '>') {
         new = p_new(char, n + m + 1);
         strcpy (new, o);        /* __STRCPY_CHECKED__ */
@@ -156,13 +155,8 @@ int mutt_check_encoding (const char *c)
     return (ENCQUOTEDPRINTABLE);
   else if (ascii_strncasecmp ("base64", c, sizeof ("base64") - 1) == 0)
     return (ENCBASE64);
-  else if (ascii_strncasecmp ("x-uuencode", c, sizeof ("x-uuencode") - 1) ==
-           0)
-    return (ENCUUENCODED);
-#ifdef SUN_ATTACHMENT
-  else if (ascii_strncasecmp ("uuencode", c, sizeof ("uuencode") - 1) == 0)
+  else if (ascii_strncasecmp ("x-uuencode", c, sizeof ("x-uuencode") - 1) == 0)
     return (ENCUUENCODED);
-#endif
   else
     return (ENCOTHER);
 }
@@ -194,8 +188,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;
@@ -234,7 +227,7 @@ static PARAMETER *parse_parameters (const char *s)
         buffer[i] = 0;
       }
 
-      new->value = str_dup (buffer);
+      new->value = m_strdup(buffer);
 
       debug_print (2, ("`%s' = `%s'\n", new->attribute ? new->attribute : "",
                   new->value ? new->value : ""));
@@ -257,10 +250,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 */
   }
@@ -277,10 +268,6 @@ int mutt_check_mime_type (const char *s)
     return TYPETEXT;
   else if (ascii_strcasecmp ("multipart", s) == 0)
     return TYPEMULTIPART;
-#ifdef SUN_ATTACHMENT
-  else if (ascii_strcasecmp ("x-sun-attachment", s) == 0)
-    return TYPEMULTIPART;
-#endif
   else if (ascii_strcasecmp ("application", s) == 0)
     return TYPEAPPLICATION;
   else if (ascii_strcasecmp ("message", s) == 0)
@@ -321,14 +308,7 @@ void mutt_parse_content_type (char *s, BODY * ct)
      * let that take precedence, and don't set it here */
     if ((pc = mutt_get_parameter ("name", ct->parameter)) != 0
         && !ct->filename)
-      ct->filename = str_dup (pc);
-
-#ifdef SUN_ATTACHMENT
-    /* this is deep and utter perversion */
-    if ((pc = mutt_get_parameter ("conversions", ct->parameter)) != 0)
-      ct->encoding = mutt_check_encoding (pc);
-#endif
-
+      ct->filename = m_strdup(pc);
   }
 
   /* Now get the subtype */
@@ -336,19 +316,14 @@ void mutt_parse_content_type (char *s, BODY * ct)
     *subtype++ = '\0';
     for (pc = subtype; *pc && !ISSPACE (*pc) && *pc != ';'; pc++);
     *pc = '\0';
-    ct->subtype = str_dup (subtype);
+    ct->subtype = m_strdup(subtype);
   }
 
   /* Finally, get the major type */
   ct->type = mutt_check_mime_type (s);
 
-#ifdef SUN_ATTACHMENT
-  if (ascii_strcasecmp ("x-sun-attachment", s) == 0)
-    ct->subtype = str_dup ("x-sun-attachment");
-#endif
-
   if (ct->type == TYPEOTHER) {
-    ct->xtype = str_dup (s);
+    ct->xtype = m_strdup(s);
   }
 
   if (ct->subtype == NULL) {
@@ -356,20 +331,20 @@ void mutt_parse_content_type (char *s, BODY * ct)
      * field, so we can attempt to convert the type to BODY here.
      */
     if (ct->type == TYPETEXT)
-      ct->subtype = str_dup ("plain");
+      ct->subtype = m_strdup("plain");
     else if (ct->type == TYPEAUDIO)
-      ct->subtype = str_dup ("basic");
+      ct->subtype = m_strdup("basic");
     else if (ct->type == TYPEMESSAGE)
-      ct->subtype = str_dup ("rfc822");
+      ct->subtype = m_strdup("rfc822");
     else if (ct->type == TYPEOTHER) {
       char buffer[SHORT_STRING];
 
       ct->type = TYPEAPPLICATION;
       snprintf (buffer, sizeof (buffer), "x-%s", s);
-      ct->subtype = str_dup (buffer);
+      ct->subtype = m_strdup(buffer);
     }
     else
-      ct->subtype = str_dup ("x-unknown");
+      ct->subtype = m_strdup("x-unknown");
   }
 
   /* Default character set for text types. */
@@ -396,14 +371,12 @@ 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)
-      str_replace (&ct->filename, s);
+    s = vskipspaces(s + 1);
+    if ((s = mutt_get_parameter("filename",
+                                (parms = parse_parameters (s)))) != 0)
+      m_strreplace(&ct->filename, s);
     if ((s = mutt_get_parameter ("name", parms)) != 0)
-      ct->form_name = str_dup (s);
+      ct->form_name = m_strdup(s);
     mutt_free_parameter (&parms);
   }
 }
@@ -431,9 +404,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;
@@ -452,30 +424,16 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
       else if (!ascii_strcasecmp ("disposition", line + 8))
         parse_content_disposition (c, p);
       else if (!ascii_strcasecmp ("description", line + 8)) {
-        str_replace (&p->description, c);
+        m_strreplace(&p->description, c);
         rfc2047_decode (&p->description);
       }
     }
-#ifdef SUN_ATTACHMENT
-    else if (!ascii_strncasecmp ("x-sun-", line, 6)) {
-      if (!ascii_strcasecmp ("data-type", line + 6))
-        mutt_parse_content_type (c, p);
-      else if (!ascii_strcasecmp ("encoding-info", line + 6))
-        p->encoding = mutt_check_encoding (c);
-      else if (!ascii_strcasecmp ("content-lines", line + 6))
-        mutt_set_parameter ("content-lines", c, &(p->parameter));
-      else if (!ascii_strcasecmp ("data-description", line + 6)) {
-        str_replace (&p->description, c);
-        rfc2047_decode (&p->description);
-      }
-    }
-#endif
   }
   p->offset = ftello (fp);       /* Mark the start of the real data */
   if (p->type == TYPETEXT && !p->subtype)
-    p->subtype = str_dup ("plain");
+    p->subtype = m_strdup("plain");
   else if (p->type == TYPEMESSAGE && !p->subtype)
-    p->subtype = str_dup ("rfc822");
+    p->subtype = m_strdup("rfc822");
 
   p_delete(&line);
 
@@ -488,13 +446,7 @@ void mutt_parse_part (FILE * fp, BODY * b)
 
   switch (b->type) {
   case TYPEMULTIPART:
-#ifdef SUN_ATTACHMENT
-    if (!ascii_strcasecmp (b->subtype, "x-sun-attachment"))
-      bound = "--------";
-    else
-#endif
-      bound = mutt_get_parameter ("boundary", b->parameter);
-
+    bound = mutt_get_parameter ("boundary", b->parameter);
     fseeko (fp, b->offset, SEEK_SET);
     b->parts = mutt_parse_multipart (fp, bound,
                                      b->offset + b->length,
@@ -521,7 +473,7 @@ void mutt_parse_part (FILE * fp, BODY * b)
   /* try to recover from parsing error */
   if (!b->parts) {
     b->type = TYPETEXT;
-    str_replace (&b->subtype, "plain");
+    m_strreplace(&b->subtype, "plain");
   }
 }
 
@@ -574,9 +526,6 @@ BODY *mutt_parse_messageRFC822 (FILE * fp, BODY * parent)
 BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
                             int digest)
 {
-#ifdef SUN_ATTACHMENT
-  int lines;
-#endif
   int blen, len, crlf = 0;
   char buffer[LONG_STRING];
   BODY *head = 0, *last = 0, *new = 0;
@@ -589,14 +538,14 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
     return (NULL);
   }
 
-  blen = str_len (boundary);
+  blen = m_strlen(boundary);
   while (ftello (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL) {
-    len = str_len (buffer);
+    len = m_strlen(buffer);
 
     crlf = (len > 1 && buffer[len - 2] == '\r') ? 1 : 0;
 
     if (buffer[0] == '-' && buffer[1] == '-' &&
-        str_ncmp (buffer + 2, boundary, blen) == 0) {
+        m_strncmp(buffer + 2, boundary, blen) == 0) {
       if (last) {
         last->length = ftello (fp) - last->offset - len - 1 - crlf;
         if (last->parts && last->parts->length == 0)
@@ -612,24 +561,13 @@ BODY *mutt_parse_multipart (FILE * fp, const char *boundary, off_t end_off,
         buffer[i] = 0;
 
       /* Check for the end boundary */
-      if (str_cmp (buffer + blen + 2, "--") == 0) {
+      if (m_strcmp(buffer + blen + 2, "--") == 0) {
         final = 1;
         break;                  /* done parsing */
       }
       else if (buffer[2 + blen] == 0) {
         new = mutt_read_mime_header (fp, digest);
 
-#ifdef SUN_ATTACHMENT
-        if (mutt_get_parameter ("content-lines", new->parameter)) {
-          for (lines =
-               atoi (mutt_get_parameter ("content-lines", new->parameter));
-               lines; lines--)
-            if (ftello (fp) >= end_off
-                || fgets (buffer, LONG_STRING, fp) == NULL)
-              break;
-        }
-#endif
-
         /*
          * Consistency checking - catch
          * bad attachment end boundaries
@@ -668,8 +606,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,16 +733,16 @@ 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);
 
-  memset (&tm, 0, sizeof (tm));
+  p_clear(&tm, 1);
 
   while ((t = strtok (t, " \t")) != NULL) {
     switch (count) {
@@ -935,8 +872,7 @@ void mutt_parse_mime_message (CONTEXT * ctx, HEADER * cur)
     if ((msg = mx_open_message (ctx, cur->msgno))) {
       mutt_parse_part (msg->fp, cur->content);
 
-      if (WithCrypto)
-        cur->security = crypt_query (cur->content);
+      cur->security = crypt_query (cur->content);
 
       mx_close_message (&msg);
     }
@@ -998,7 +934,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
       }
       else if (ascii_strcasecmp (line + 8, "description") == 0) {
         if (hdr) {
-          str_replace (&hdr->content->description, p);
+          m_strreplace(&hdr->content->description, p);
           rfc2047_decode (&hdr->content->description);
         }
         matched = 1;
@@ -1013,7 +949,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 
   case 'd':
     if (!ascii_strcasecmp ("ate", line + 1)) {
-      str_replace (&e->date, p);
+      m_strreplace(&e->date, p);
       if (hdr)
         hdr->date_sent = mutt_parse_date (p, hdr);
       matched = 1;
@@ -1034,16 +970,16 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
        * and mark mail/(esp.) news article as your own. aaargh! this
        * bothered me for _years_ */
       if (!e->from) {
-        e->from = rfc822_new_address ();
-        e->from->personal = str_dup (p);
+        e->from = address_new ();
+        e->from->personal = m_strdup(p);
       }
       matched = 1;
     }
 #ifdef USE_NNTP
-    else if (!str_casecmp (line + 1, "ollowup-to")) {
+    else if (!m_strcasecmp(line + 1, "ollowup-to")) {
       if (!e->followup_to) {
-        str_skip_trailws (p);
-        e->followup_to = str_dup (str_skip_initws (p));
+        m_strrtrim(p);
+        e->followup_to = m_strdup(skipspaces(p));
       }
       matched = 1;
     }
@@ -1086,7 +1022,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
           /* Take the first mailto URL */
           if (url_check_scheme (beg) == U_MAILTO) {
             p_delete(&e->list_post);
-            e->list_post = str_substrdup (beg, end);
+            e->list_post = p_dupstr(beg, end - beg);
             break;
           }
         }
@@ -1110,7 +1046,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     else if (!ascii_strncasecmp (line + 1, "ail-", 4)) {
       if (!ascii_strcasecmp (line + 5, "reply-to")) {
         /* override the Reply-To: field */
-        rfc822_free_address (&e->reply_to);
+        address_delete (&e->reply_to);
         e->reply_to = rfc822_parse_adrlist (e->reply_to, p);
         matched = 1;
       }
@@ -1123,10 +1059,10 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 
 #ifdef USE_NNTP
   case 'n':
-    if (!str_casecmp (line + 1, "ewsgroups")) {
+    if (!m_strcasecmp(line + 1, "ewsgroups")) {
       p_delete(&e->newsgroups);
-      str_skip_trailws (p);
-      e->newsgroups = str_dup (str_skip_initws (p));
+      m_strrtrim(p);
+      e->newsgroups = m_strdup(skipspaces(p));
       matched = 1;
     }
     break;
@@ -1134,9 +1070,9 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 
   case 'o':
     /* field `Organization:' saves only for pager! */
-    if (!str_casecmp (line + 1, "rganization")) {
-      if (!e->organization && str_casecmp (p, "unknown"))
-        e->organization = str_dup (p);
+    if (!m_strcasecmp(line + 1, "rganization")) {
+      if (!e->organization && m_strcasecmp(p, "unknown"))
+        e->organization = m_strdup(p);
     }
     break;
 
@@ -1167,7 +1103,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
   case 's':
     if (!ascii_strcasecmp (line + 1, "ubject")) {
       if (!e->subject)
-        e->subject = str_dup (p);
+        e->subject = m_strdup(p);
       matched = 1;
     }
     else if (!ascii_strcasecmp (line + 1, "ender")) {
@@ -1195,7 +1131,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     }
     else if ((!ascii_strcasecmp ("upersedes", line + 1) ||
               !ascii_strcasecmp ("upercedes", line + 1)) && hdr)
-      e->supersedes = str_dup (p);
+      e->supersedes = m_strdup(p);
     break;
 
   case 't':
@@ -1228,18 +1164,18 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
       matched = 1;
     }
     else if (ascii_strcasecmp (line + 1, "-label") == 0) {
-      e->x_label = str_dup (p);
+      e->x_label = m_strdup(p);
       matched = 1;
     }
 #ifdef USE_NNTP
-    else if (!str_casecmp (line + 1, "-comment-to")) {
+    else if (!m_strcasecmp(line + 1, "-comment-to")) {
       if (!e->x_comment_to)
-        e->x_comment_to = str_dup (p);
+        e->x_comment_to = m_strdup(p);
       matched = 1;
     }
-    else if (!str_casecmp (line + 1, "ref")) {
+    else if (!m_strcasecmp(line + 1, "ref")) {
       if (!e->xref)
-        e->xref = str_dup (p);
+        e->xref = m_strdup(p);
       matched = 1;
     }
 #endif
@@ -1251,7 +1187,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
   /* Keep track of the user-defined headers */
   if (!matched && user_hdrs) {
     /* restore the original line */
-    line[str_len (line)] = ':';
+    line[m_strlen(line)] = ':';
 
     if (weed && option (OPTWEED) && mutt_matches_ignore (line, Ignore)
         && !mutt_matches_ignore (line, UnIgnore))
@@ -1263,7 +1199,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     }
     else
       last = e->userhdrs = mutt_new_list ();
-    last->data = str_dup (line);
+    last->data = m_strdup(line);
     if (do_2047)
       rfc2047_decode (&last->data);
   }
@@ -1311,7 +1247,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
 
       /* set the defaults from RFC1521 */
       hdr->content->type = TYPETEXT;
-      hdr->content->subtype = str_dup ("plain");
+      hdr->content->subtype = m_strdup("plain");
       hdr->content->encoding = ENC7BIT;
       hdr->content->length = -1;
 
@@ -1329,7 +1265,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
       time_t t;
 
       /* some bogus MTAs will quote the original "From " line */
-      if (str_ncmp (">From ", line, 6) == 0)
+      if (m_strncmp(">From ", line, 6) == 0)
         continue;               /* just ignore */
       else if (is_from (line, return_path, sizeof (return_path), &t)) {
         /* MH somtimes has the From_ line in the middle of the header! */
@@ -1378,9 +1314,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 */
 
@@ -1394,7 +1329,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
   if (hdr) {
     hdr->content->hdr_offset = hdr->offset;
     hdr->content->offset = ftello (f);
-    rfc2047_decode_envelope (e);
+    rfc2047_decode_envelope(e);
     /* check for missing or invalid date */
     if (hdr->date_sent <= 0) {
       debug_print (1, ("no date found, using received "
@@ -1406,7 +1341,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
   return (e);
 }
 
-ADDRESS *mutt_parse_adrlist (ADDRESS * p, const char *s)
+address_t *mutt_parse_adrlist (address_t * p, const char *s)
 {
   const char *q;
 
@@ -1415,7 +1350,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);
@@ -1491,7 +1426,7 @@ int count_body_parts (BODY *body, int flags) {
     } else if (bp->type == TYPEMULTIPART) {
       /* Always recurse multiparts, except multipart/alternative. */
       shallrecurse = 1;
-      if (!str_casecmp(bp->subtype, "alternative"))
+      if (!m_strcasecmp(bp->subtype, "alternative"))
         shallrecurse = 0;
 
       /* Don't count containers if they're top-level. */