drop the ad-hoc TZ parse, non-rfc822 compliant dates are quite rare

nowadays, I don't care about those.

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

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 8b8b893..93a467b 100644 (file)
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -59,18 +59,17 @@ int url_parse_mailto(ENVELOPE *e, char **body, const char *src);
 /****************************************************************************/
 
 typedef struct rfc1524_entry {
-  /*  char *contenttype; *//* we don't need this, as we search for it */
-  char *command;
-  char *testcommand;
-  char *composecommand;
-  char *composetypecommand;
-  char *editcommand;
-  char *printcommand;
-  char *nametemplate;
-  char *convert;
-
-  unsigned needsterminal:1; /* endwin() and system */
-  unsigned copiousoutput:1; /* needs pager, basically */
+    char *command;
+    char *testcommand;
+    char *composecommand;
+    char *composetypecommand;
+    char *editcommand;
+    char *printcommand;
+    char *nametemplate;
+    char *convert;
+
+    unsigned needsterminal:1; /* endwin() and system */
+    unsigned copiousoutput:1; /* needs pager, basically */
 } rfc1524_entry;
 
 DO_INIT(rfc1524_entry, rfc1524_entry);
@@ -100,7 +99,7 @@ void mutt_parse_part(FILE *, BODY *);
 BODY *mutt_parse_messageRFC822(FILE *, BODY *);
 BODY *mutt_parse_multipart(FILE *, const char *, off_t, int);
 string_list_t **mutt_parse_rfc822_line(ENVELOPE *, HEADER *, char *line, char *p,
-                              short weed, short do_2047, string_list_t **);
+                                       short weed, short do_2047, string_list_t **);
 ENVELOPE *mutt_read_rfc822_header(FILE *, HEADER *, short, short);
 int mutt_count_body_parts (HEADER *hdr, int flags);
 

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 77cbe47..40da94d 100644 (file)
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -615,62 +615,6 @@ uncomment_timezone(char *buf, size_t buflen, const char *tz)
     return buf;
 }
 
-static struct tz_t {
-    char tzname[5];
-    unsigned char zhours;
-    unsigned char zminutes;
-    unsigned char zoccident;      /* west of UTC? */
-} TimeZones[] = {
-    {"aat", 1, 0, 1},             /* Atlantic Africa Time */
-    {"adt", 4, 0, 0},             /* Arabia DST */
-    {"ast", 3, 0, 0},             /* Arabia */
-    /*{ "ast",   4,  0, 1 }, *//* Atlantic */
-    {"bst", 1, 0, 0},             /* British DST */
-    {"cat", 1, 0, 0},             /* Central Africa */
-    {"cdt", 5, 0, 1},
-    {"cest", 2, 0, 0},            /* Central Europe DST */
-    {"cet", 1, 0, 0},             /* Central Europe */
-    {"cst", 6, 0, 1},
-    /*{ "cst",   8,  0, 0 }, *//* China */
-    /*{ "cst",   9, 30, 0 }, *//* Australian Central Standard Time */
-    {"eat", 3, 0, 0},             /* East Africa */
-    {"edt", 4, 0, 1},
-    {"eest", 3, 0, 0},            /* Eastern Europe DST */
-    {"eet", 2, 0, 0},             /* Eastern Europe */
-    {"egst", 0, 0, 0},            /* Eastern Greenland DST */
-    {"egt", 1, 0, 1},             /* Eastern Greenland */
-    {"est", 5, 0, 1},
-    {"gmt", 0, 0, 0},
-    {"gst", 4, 0, 0},             /* Presian Gulf */
-    {"hkt", 8, 0, 0},             /* Hong Kong */
-    {"ict", 7, 0, 0},             /* Indochina */
-    {"idt", 3, 0, 0},             /* Israel DST */
-    {"ist", 2, 0, 0},             /* Israel */
-    /*{ "ist",   5, 30, 0 }, *//* India */
-    {"jst", 9, 0, 0},             /* Japan */
-    {"kst", 9, 0, 0},             /* Korea */
-    {"mdt", 6, 0, 1},
-    {"met", 1, 0, 0},             /* this is now officially CET */
-    {"msd", 4, 0, 0},             /* Moscow DST */
-    {"msk", 3, 0, 0},             /* Moscow */
-    {"mst", 7, 0, 1},
-    {"nzdt", 13, 0, 0},           /* New Zealand DST */
-    {"nzst", 12, 0, 0},           /* New Zealand */
-    {"pdt", 7, 0, 1},
-    {"pst", 8, 0, 1},
-    {"sat", 2, 0, 0},             /* South Africa */
-    {"smt", 4, 0, 0},             /* Seychelles */
-    {"sst", 11, 0, 1},            /* Samoa */
-    /*{ "sst",   8,  0, 0 }, *//* Singapore */
-    {"utc", 0, 0, 0},
-    {"wat", 0, 0, 0},             /* West Africa */
-    {"west", 1, 0, 0},            /* Western Europe DST */
-    {"wet", 0, 0, 0},             /* Western Europe */
-    {"wgst", 2, 0, 1},            /* Western Greenland DST */
-    {"wgt", 3, 0, 1},             /* Western Greenland */
-    {"wst", 8, 0, 0},             /* Western Australia */
-};
-
 /* parses a date string in RFC822 format:
  *
  * Date: [ weekday , ] day-of-month month year hour:minute:second timezone
@@ -752,26 +696,6 @@ time_t mutt_parse_date(const char *s, HEADER *h)
                     zhours    = (ptz[1] - '0') * 10 + (ptz[2] - '0');
                     zminutes  = (ptz[3] - '0') * 10 + (ptz[4] - '0');
                 }
-            } else {
-                struct tz_t *tz;
-
-                /* This is safe to do: A pointer to a struct equals a pointer to its
-                 * first element*/
-                tz = bsearch(ptz, TimeZones, countof(TimeZones), sizeof(TimeZones[0]),
-                             (int (*)(const void *, const void *))ascii_strcasecmp);
-
-                if (tz) {
-                    zhours = tz->zhours;
-                    zminutes = tz->zminutes;
-                    zoccident = tz->zoccident;
-                }
-
-                /* ad hoc support for the European MET (now officially CET) TZ */
-                if (ascii_strcasecmp(p, "MET") == 0) {
-                    if ((p = strtok (NULL, " \t")) && !ascii_strcasecmp(p, "DST")) {
-                        zhours++;
-                    }
-                }
             }
             break;
         }