X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=121efb18b0d1641e09ed4ff8499c566ccd816841;hp=40c84f5dd9142f4aff9ce614fb7fe3a6bd621d2f;hb=refs%2Fheads%2Ftry-some-d;hpb=8db3fe9c19320b6f6e508d6b1aae03980239a930

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 40c84f5..121efb1 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -188,14 +188,13 @@ int mutt_check_mime_type(const char *s)
     }
 }
 
-static parameter_t *parse_parameters(const char *s)
+static parameters_t *parse_parameters(const char *s)
 {
-    parameter_t *res = NULL;
-    parameter_t **list = &res;
+    parameters_t *res = parameter_new();
 
     while (*s) {
+        char *attr, *val;
         const char *p;
-        parameter_t *new;
         int i;
 
         s = skipspaces(s);
@@ -213,11 +212,10 @@ static parameter_t *parse_parameters(const char *s)
         }
 
         i = p - s;
-        new = parameter_new();
-        new->attribute = p_dupstr(s, i);
+        attr = p_dupstr(s, i);
 
-        while (--i >= 0 && ISSPACE(new->attribute[i])) {
-            new->attribute[i] = '\0';
+        while (--i >= 0 && ISSPACE(attr[i])) {
+            attr[i] = '\0';
         }
         s = skipspaces(p + 1);                      /* skip over the = */
 
@@ -242,21 +240,21 @@ static parameter_t *parse_parameters(const char *s)
                 }
             }
 
-            new->value = p_dupstr(buffer, i);
+            val = p_dupstr(buffer, i);
         } else {
             for (p = s; *p && *p != ' ' && *p != ';'; p++);
-            new->value = p_dupstr(s, p - s);
+            val = p_dupstr(s, p - s);
         }
 
-        *list = new;
-        list = &new->next;
-
+        parameter_setval(res, attr, val);
+        p_delete(&attr);
+        p_delete(&val);
         s = strchr(s, ';');           /* Find the next parameter */
         if (!s)
             break;                    /* no more parameters */
     }
 
-    rfc2231_decode_parameters(&res);
+    rfc2231_decode_parameters(res);
     return res;
 }
 
@@ -266,7 +264,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
     char *subtype;
 
     p_delete(&ct->subtype);
-    parameter_list_wipe(&ct->parameter);
+    ct->parameter = NULL;
 
     /* First extract any existing parameters */
     if ((pc = strchr(s, ';')) != NULL) {
@@ -330,7 +328,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
     if (ct->type == TYPETEXT) {
         pc = parameter_getval(ct->parameter, "charset");
         if (!pc) {
-            parameter_setval(&ct->parameter, "charset",
+            parameter_setval(ct->parameter, "charset",
                              charset_getfirst(mod_cset.assumed_charset));
         }
     }
@@ -348,14 +346,12 @@ static void parse_content_disposition(const char *s, BODY *ct)
 
     /* Check to see if a default filename was given */
     if ((s = strchr (s, ';'))) {
-        parameter_t *parms = parse_parameters(vskipspaces(s));
+        parameters_t *parms = parse_parameters(vskipspaces(s));
 
         if ((s = parameter_getval(parms, "filename")))
             m_strreplace(&ct->filename, s);
         if ((s = parameter_getval(parms, "name")))
             ct->form_name = m_strdup(s);
-
-        parameter_list_wipe(&parms);
     }
 }
 
@@ -419,7 +415,7 @@ BODY *mutt_read_mime_header(FILE *fp, int digest)
     }
 
     p_delete(&line);
-    return (body);
+    return body;
 }
 
 void mutt_parse_part(FILE *fp, BODY *b)
@@ -578,24 +574,7 @@ mutt_parse_multipart(FILE *fp, const char *bound, off_t end_off, int digest)
             mutt_parse_part(fp, b);
     }
 
-    return (head);
-}
-
-static const char *
-uncomment_timezone(char *buf, size_t buflen, const char *tz)
-{
-    char *p;
-
-    if (*tz != '(')
-        return tz;                  /* no need to do anything */
-
-    tz = vskipspaces(tz + 1);
-    p = strpbrk(tz, " )");
-    if (!p)
-        return tz;
-
-    m_strncpy(buf, buflen, tz, p - tz);
-    return buf;
+    return head;
 }
 
 /* parses a date string in RFC822 format:
@@ -607,96 +586,24 @@ uncomment_timezone(char *buf, size_t buflen, const char *tz)
  */
 time_t mutt_parse_date(const char *s, HEADER *h)
 {
-    int zhours = 0, zminutes = 0, zoccident = 0;
-    char scratch[STRING];
     struct tm tm;
-    int count = 0;
-    char *p;
-
-    /* Don't modify our argument. Fixed-size buffer is ok here since
-       the date format imposes a natural limit.  */
-
-    m_strcpy(scratch, sizeof(scratch), s);
-
-    /* kill the day of the week, if it exists. */
-    p = strchr(scratch, ',');
-    p = vskipspaces(p ? p + 1 : scratch);
+    const char *loc;
+    time_t tz;
 
+    loc = setlocale(LC_ALL, "C");
     p_clear(&tm, 1);
+    if (strptime(s, "%a, %d %b %Y %H:%M:%S %z", &tm))
+        goto ok;
+    p_clear(&tm, 1);
+    if (strptime(s, "%a, %d %b %Y %H:%M %z", &tm))
+        goto ok;
+    setlocale(LC_ALL, "");
+    return 0;
 
-    while ((p = strtok (p, " \t")) != NULL) {
-        char tzstr[STRING];
-        const char *ptz;
-
-        switch (count) {
-          case 0:                    /* day of the month */
-            if (!isdigit((unsigned char)*p))
-                return -1;
-            tm.tm_mday = atoi(p);
-            if (tm.tm_mday > 31)
-                return -1;
-            break;
-
-          case 1:                    /* month of the year */
-            tm.tm_mon = mutt_check_month(p);
-            if (tm.tm_mon < 0)
-                return -1;
-            break;
-
-          case 2:                    /* year */
-            tm.tm_year = atoi(p);
-            if (tm.tm_year < 50)
-                tm.tm_year += 100;
-            else if (tm.tm_year >= 1900)
-                tm.tm_year -= 1900;
-            break;
-
-          case 3:                    /* time of day */
-            tm.tm_hour = strtol(p, &p, 10);
-            if (*p++ != ':')
-                return -1;
-            tm.tm_min  = strtol(p, &p, 10);
-            if (*p++ == ':') {
-                tm.tm_sec = strtol(p, &p, 10);
-            } else {
-                tm.tm_sec = 0;
-            }
-            break;
-
-          case 4:                    /* timezone */
-            /* sometimes we see things like (MST) or (-0700) so attempt to
-             * compensate by uncommenting the string if non-RFC822 compliant
-             */
-            ptz = uncomment_timezone(tzstr, sizeof(tzstr), p);
-
-            if (*ptz == '+' || *ptz == '-') {
-                if (isdigit((unsigned char)ptz[1])
-                &&  isdigit((unsigned char)ptz[2])
-                &&  isdigit((unsigned char)ptz[3])
-                &&  isdigit((unsigned char)ptz[4]))
-                {
-                    zoccident = ptz[0] == '-';
-                    zhours    = (ptz[1] - '0') * 10 + (ptz[2] - '0');
-                    zminutes  = (ptz[3] - '0') * 10 + (ptz[4] - '0');
-                }
-            }
-            break;
-        }
-        count++;
-        p = NULL;
-    }
-
-    if (count < 4) {  /* don't check for missing timezone */
-        return -1;
-    }
-
-    if (h) {
-        h->zhours    = zhours;
-        h->zminutes  = zminutes;
-        h->zoccident = zoccident;
-    }
-
-    return mutt_mktime(&tm, 0) + (zoccident ? 1 : -1) * (zhours * 3600 + zminutes * 60);
+  ok:
+    setlocale(LC_ALL, "");
+    tz = tm.tm_gmtoff;
+    return timegm(&tm) - tz;
 }
 
 string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, char *p,
@@ -759,15 +666,6 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
             hdr->expired = 1;
         break;
 
-#ifdef USE_NNTP
-      case MIME_FOLLOWUP_TO:
-        if (!e->followup_to) {
-            m_strrtrim(p);
-            e->followup_to = m_strdup(skipspaces(p));
-        }
-        break;
-#endif
-
       case MIME_FROM:
         e->from = rfc822_parse_adrlist(e->from, p);
         /* don't leave from info NULL if there's an invalid address (or
@@ -839,14 +737,6 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
             hdr->mime = 1;
         break;
 
-#ifdef USE_NNTP
-      case MIME_NEWSGROUPS:
-        p_delete(&e->newsgroups);
-        m_strrtrim(p);
-        e->newsgroups = m_strdup(skipspaces(p));
-        break;
-#endif
-
       case MIME_ORGANIZATION:
         if (!e->organization && mime_which_token(p, -1) == MIME_UNKNOWN)
             e->organization = m_strdup(p);
@@ -915,13 +805,6 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
         e->x_label = m_strdup(p);
         break;
 
-#ifdef USE_NNTP
-      case MIME_XREF:
-        if (!e->xref)
-            e->xref = m_strdup(p);
-        break;
-#endif
-
       case MIME_X_STATUS:
         if (hdr) {
             while (*p) {
@@ -1149,3 +1032,72 @@ int mutt_count_body_parts(HEADER *hdr, int flags)
     hdr->attach_valid = 1;
     return hdr->attach_total;
 }
+
+/*
+ * A valid message separator looks like:
+ *
+ * From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
+ */
+bool is_from(const char *s, char *path, ssize_t pathlen, time_t *tp)
+{
+    const char *p;
+    struct tm tm;
+    char *loc;
+    int q = 0;
+
+    if (path)
+        *path = 0;
+
+    if (m_strncmp("From ", s, 5) != 0)
+        return false;
+
+    s = skipspaces(s + 5);         /* skip over the From part. */
+    if (!*s)
+        return false;
+
+    for (p = s; *p && (q || !ISSPACE(*p)); p++) {
+        if (*p == '\\') {
+            if (*++p == '\0')
+                return false;
+        }
+        else if (*p == '"') {
+            q = !q;
+        }
+    }
+
+    if (q || !*p)
+        return false;
+
+    if (path)
+        m_strncpy(path, pathlen, s, p - s);
+
+    s = vskipspaces(p + 1);
+    if (!*s)
+        return false;
+
+    loc = setlocale(LC_TIME, "C");
+    for (int i = 0; i < 4; i++) {
+        static char const * const formats[] = {
+            "%a %b %d %H:%M:%S %Y",
+            "%a %b %d %H:%M:%S %z %Y",
+            "%a %b %d %H:%M %Y",
+            "%a %b %d %H:%M %z %Y",
+        };
+
+        p_clear(&tm, 1);
+        p = strptime(s, formats[i], &tm);
+        if (p) {
+            s = p;
+            goto ok;
+        }
+    }
+    setlocale(LC_TIME, loc);
+    return false;
+
+  ok:
+    if (tp) {
+        *tp = tm.tm_gmtoff;
+        *tp = timegm(&tm) - *tp;
+    }
+    return true;
+}