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

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index c39eccc..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,7 +574,7 @@ mutt_parse_multipart(FILE *fp, const char *bound, off_t end_off, int digest)
             mutt_parse_part(fp, b);
     }
 
-    return (head);
+    return head;
 }
 
 /* parses a date string in RFC822 format:
@@ -592,20 +588,22 @@ time_t mutt_parse_date(const char *s, HEADER *h)
 {
     struct tm tm;
     const char *loc;
-    loc = setlocale(LC_TIME, "C");
+    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_TIME, loc);
+    setlocale(LC_ALL, "");
     return 0;
 
   ok:
-    setlocale(LC_TIME, loc);
-    return mutt_mktime(&tm, 1);
+    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,
@@ -668,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
@@ -748,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);
@@ -824,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) {
@@ -1121,7 +1095,9 @@ bool is_from(const char *s, char *path, ssize_t pathlen, time_t *tp)
     return false;
 
   ok:
-    if (tp)
-        *tp = mutt_mktime(&tm, 1);
+    if (tp) {
+        *tp = tm.tm_gmtoff;
+        *tp = timegm(&tm) - *tp;
+    }
     return true;
 }