X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=f4b60a7ac1ad853833fde371d5ae60f9f877719b;hp=4fe8ee8c073e61aee4c5b9ad2413c92deac76d72;hb=cfe08f2ca21af629f74268f1f1425a5fec0494cd;hpb=d4b790a79307b4f53c49f4c25223977a8baa6aa1 diff --git a/imap/util.c b/imap/util.c index 4fe8ee8..f4b60a7 100644 --- a/imap/util.c +++ b/imap/util.c @@ -64,11 +64,11 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx) mx->mbox = m_strdup(url.path); if (url.scheme == U_IMAPS) - mx->account.flags |= M_ACCT_SSL; + mx->account.has_ssl = 1; p_delete(&c); - if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT)) + if (mx->account.has_ssl && !mx->account.has_port) mx->account.port = ImapsPort; return 0; @@ -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; } @@ -255,38 +256,14 @@ 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) { - 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; + + p_clear(&tm, 1); + loc = setlocale(LC_TIME, "C"); + strptime(s, "%d-%b-%Y %T %z", &tm); + setlocale(LC_TIME, loc); + return mutt_mktime(&tm, 1); } /* imap_qualify_path: make an absolute IMAP folder target, given IMAP_MBOX