X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=3afeb7c0fd1e6744ecfd8737a56e66851bd39794;hb=9f73142b38da00f437415d502caa54ab230bd7f0;hp=d2fb218af4e03a2a5ef84aa26f90717732770965;hpb=e0571c496935f226abe4a22921b5b4e10d1481e8;p=apps%2Fmadmutt.git

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index d2fb218..3afeb7c 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -592,11 +592,22 @@ time_t mutt_parse_date(const char *s, HEADER *h)
 {
     struct tm tm;
     const char *loc;
+    time_t tz;
+
+    loc = setlocale(LC_ALL, "C");
     p_clear(&tm, 1);
-    loc = setlocale(LC_TIME, "C");
-    s = strptime(s, "%a, %d %b %Y %T %z", &tm);
-    setlocale(LC_TIME, loc);
-    return mutt_mktime(&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;
+
+  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,
@@ -1049,3 +1060,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;
+}