Rewrite is_from efficiently, and put it in lib-mime where it belongs.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8637b37..67bede3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -288,7 +288,6 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     copy.c
     editmsg.c
     flags.c
-    from.c
     handler.c
     headers.c
     help.c

diff --git a/from.c b/from.c
deleted file mode 100644 (file)
index 5931789..0000000
--- a/from.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright notice from original mutt:
- * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- *
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
- */
-
-#include <lib-lib/lib-lib.h>
-
-#include "mutt.h"
-
-int mutt_check_month (const char *s)
-{
-  int i;
-
-  for (i = 0; i < 12; i++)
-    if (m_strncasecmp(s, Months[i], 3) == 0)
-      return (i);
-  return (-1);                  /* error */
-}
-
-static int is_day_name (const char *s)
-{
-  int i;
-
-  if ((m_strlen(s) < 3) || !*(s + 3) || !ISSPACE (*(s + 3)))
-    return 0;
-  for (i = 0; i < 7; i++)
-    if (m_strncasecmp(s, Weekdays[i], 3) == 0)
-      return 1;
-  return 0;
-}
-
-/*
- * A valid message separator looks like:
- *
- * From [ <return-path> ] <weekday> <month> <day> <time> [ <timezone> ] <year>
- */
-
-int is_from (const char *s, char *path, ssize_t pathlen, time_t * tp)
-{
-  struct tm tm;
-  int yr;
-
-  if (path)
-    *path = 0;
-
-  if (m_strncmp("From ", s, 5) != 0)
-    return 0;
-
-  s = m_strnextsp(s);            /* skip over the From part. */
-  s = skipspaces(s);
-  if (!*s)
-    return 0;
-
-  if (!is_day_name (s)) {
-    const char *p;
-    ssize_t len;
-    short q = 0;
-
-    for (p = s; *p && (q || !ISSPACE (*p)); p++) {
-      if (*p == '\\') {
-        if (*++p == '\0')
-          return 0;
-      }
-      else if (*p == '"') {
-        q = !q;
-      }
-    }
-
-    if (q || !*p)
-      return 0;
-
-    if (path) {
-      len = p - s;
-      if (len + 1 > pathlen)
-        len = pathlen - 1;
-      memcpy (path, s, len);
-      path[len] = 0;
-    }
-
-    s = vskipspaces(p + 1);
-    if (!*s)
-      return 0;
-
-    if (!is_day_name (s)) {
-      return 0;
-    }
-  }
-
-  s = m_strnextsp(s);
-  s = skipspaces(s);
-  if (!*s)
-    return 0;
-
-  /* do a quick check to make sure that this isn't really the day of the week.
-   * this could happen when receiving mail from a local user whose login name
-   * is the same as a three-letter abbreviation of the day of the week.
-   */
-  if (is_day_name (s)) {
-    s = m_strnextsp(s);
-    s = skipspaces(s);
-    if (!*s)
-      return 0;
-  }
-
-  /* now we should be on the month. */
-  if ((tm.tm_mon = mutt_check_month (s)) < 0)
-    return 0;
-
-  /* day */
-  s = m_strnextsp(s);
-  s = skipspaces(s);
-  if (!*s)
-    return 0;
-  if (sscanf (s, "%d", &tm.tm_mday) != 1)
-    return 0;
-
-  /* time */
-  s = m_strnextsp(s);
-  s = skipspaces(s);
-  if (!*s)
-    return 0;
-
-  /* Accept either HH:MM or HH:MM:SS */
-  if (sscanf (s, "%d:%d:%d", &tm.tm_hour, &tm.tm_min, &tm.tm_sec) == 3);
-  else if (sscanf (s, "%d:%d", &tm.tm_hour, &tm.tm_min) == 2)
-    tm.tm_sec = 0;
-  else
-    return 0;
-
-  s = m_strnextsp(s);
-  s = skipspaces(s);
-  if (!*s)
-    return 0;
-
-  /* timezone? */
-  if (isalpha ((unsigned char) *s) || *s == '+' || *s == '-') {
-    s = m_strnextsp(s);
-    s = skipspaces(s);
-    if (!*s)
-      return 0;
-
-    /*
-     * some places have two timezone fields after the time, e.g.
-     *      From xxxx@yyyyyyy.fr Wed Aug  2 00:39:12 MET DST 1995
-     */
-    if (isalpha ((unsigned char) *s)) {
-      s = m_strnextsp(s);
-      s = skipspaces(s);
-      if (!*s)
-        return 0;
-    }
-  }
-
-  /* year */
-  if (sscanf (s, "%d", &yr) != 1)
-    return 0;
-  tm.tm_year = yr > 1900 ? yr - 1900 : (yr < 70 ? yr + 100 : yr);
-
-  tm.tm_isdst = -1;
-
-  if (tp)
-    *tp = mutt_mktime (&tm, 0);
-  return 1;
-}

diff --git a/globals.h b/globals.h
index 5c574b9..301f9ac 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -155,12 +155,10 @@ WHERE char *SmimeDefaultKey;
 WHERE char *SmimeCryptAlg;
 
 #ifdef MAIN_C
-const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
 const char *Months[] =
   { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
 "Nov", "Dec", "ERR" };
 #else
-extern const char *Weekdays[];
 extern const char *Months[];
 #endif
 

diff --git a/imap/util.c b/imap/util.c
index 16aa75f..f4b60a7 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -258,7 +258,6 @@ time_t imap_parse_date (char *s)
 {
     struct tm tm;
     const char *loc;
-    time_t tz;
 
     p_clear(&tm, 1);
     loc = setlocale(LC_TIME, "C");

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 478b2b0..297576e 100644 (file)
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -96,6 +96,7 @@ int rfc1524_mailcap_isneeded(BODY *);
 
 extern const char RFC822Specials[];
 
+bool is_from(const char *, char *, ssize_t, time_t*);
 ssize_t mutt_read_rfc822_line(FILE*, char**, ssize_t*);
 string_list_t *mutt_parse_references(char *, int);
 int mutt_check_encoding(const char *);

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index d5614fc..c39eccc 100644 (file)
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -1058,3 +1058,70 @@ 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 = mutt_mktime(&tm, 1);
+    return true;
+}

diff --git a/protos.h b/protos.h
index b10189a..d44db3d 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -34,8 +34,6 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b);
 
 int mutt_cmp_header (const HEADER*, const HEADER*);
 
-int is_from (const char *, char *, ssize_t, time_t *);
-
 ssize_t _mutt_expand_path(char *, ssize_t, const char *, int);
 #define mutt_expand_path(s, n) _mutt_expand_path((s), (n), (s), 0)