X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=b6ba3107b45c8d1286a852d5b40d600f62804390;hp=230f005590e918e9aad3c45e12c1c72b25868e2b;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=2e0d58d93811d43a16f078562cbfa1526c96a371 diff --git a/imap/util.c b/imap/util.c index 230f005..b6ba310 100644 --- a/imap/util.c +++ b/imap/util.c @@ -254,40 +254,18 @@ char *imap_next_word (char *s) } /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */ -time_t imap_parse_date (char *s) +time_t imap_parse_date(char *s) { - struct tm t; - time_t tz; - - t.tm_mday = strtol(s, &s, 10); - if (*s++ != '-') - return 0; - t.tm_mon = mutt_check_month(s); - s += 3; - if (*s++ != '-') - return 0; - t.tm_year = strtol(s, &s, 10) - 1900; - if (*s++ != ' ') - return 0; - - /* time */ - t.tm_hour = strtol(s, &s, 10); - if (*s++ != ':') - return 0; - t.tm_min = strtol(s, &s, 10); - if (*s++ != ':') - return 0; - t.tm_sec = strtol(s, &s, 10); - if (*s++ != ' ') - return 0; - - /* timezone */ - tz = strtol(s + 1, NULL, 10); - tz = (tz / 100) * 3600 + (tz % 100) * 60; - if (s[0] == '+') - tz = -tz; - - return (mutt_mktime (&t, 0) + tz); + struct tm tm; + const char *loc; + time_t tz; + + p_clear(&tm, 1); + loc = setlocale(LC_TIME, "C"); + strptime(s, "%d-%b-%Y %T %z", &tm); + tz = tm.tm_gmtoff; + setlocale(LC_TIME, loc); + return timegm(&tm) + tz; } /* imap_qualify_path: make an absolute IMAP folder target, given IMAP_MBOX