X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=3cf6fbc73bd37594deb2f53b670de239eb636bf0;hb=6b4475312b058043257fba4526817f60d9e26baf;hp=db7e3aff11e300b028b5e75b26e244d59c5f417d;hpb=bbaf5ab9813d18f9912e00fab83195e368e3f0d7;p=apps%2Fmadmutt.git diff --git a/imap/util.c b/imap/util.c index db7e3af..3cf6fbc 100644 --- a/imap/util.c +++ b/imap/util.c @@ -148,6 +148,7 @@ IMAP_DATA *imap_new_idata (void) { IMAP_DATA *res = p_new(IMAP_DATA, 1); buffer_init(&res->cmd.buf); + res->isnew = 1; return res; } @@ -206,14 +207,14 @@ int imap_get_literal_count (const char *buf, long *bytes) char *pn; if (!(pc = strchr (buf, '{'))) - return (-1); + return -1; pc++; pn = pc; while (isdigit ((unsigned char) *pc)) pc++; *pc = 0; *bytes = atoi (pn); - return (0); + return 0; } /* imap_get_qualifier: in a tagged response, skip tag and status for @@ -253,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