#include "mutt.h"
#include "imap_private.h"
-#include <lib-sys/mutt_ssl.h>
/* -- public functions -- */
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;
* Returns NULL on failure (no mem) */
IMAP_DATA *imap_new_idata (void)
{
- return p_new(IMAP_DATA, 1);
+ IMAP_DATA *res = p_new(IMAP_DATA, 1);
+ buffer_init(&res->cmd.buf);
+ res->isnew = 1;
+ return res;
}
/* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
void imap_free_idata (IMAP_DATA ** idata)
{
- if (!idata)
- return;
-
- p_delete(&(*idata)->capstr);
- string_list_wipe(&(*idata)->flags);
- p_delete(&((*idata)->cmd.buf));
- p_delete(idata);
+ if (*idata) {
+ p_delete(&(*idata)->capstr);
+ string_list_wipe(&(*idata)->flags);
+ buffer_wipe(&((*idata)->cmd.buf));
+ p_delete(idata);
+ }
}
/*
}
/* 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 = (s[0] == ' ' ? s[1] - '0' : (s[0] - '0') * 10 + (s[1] - '0'));
- s += 2;
- if (*s != '-')
- return 0;
- s++;
- t.tm_mon = mutt_check_month (s);
- s += 3;
- if (*s != '-')
- return 0;
- s++;
- t.tm_year =
- (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] -
- '0') -
- 1900;
- s += 4;
- if (*s != ' ')
- return 0;
- s++;
-
- /* time */
- t.tm_hour = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
- return 0;
- s++;
- t.tm_min = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
- return 0;
- s++;
- t.tm_sec = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ' ')
- return 0;
- s++;
-
- /* timezone */
- tz = ((s[1] - '0') * 10 + (s[2] - '0')) * 3600 +
- ((s[3] - '0') * 10 + (s[4] - '0')) * 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
*
*/
-static RETSIGTYPE alrm_handler (int sig __attribute__((unused)))
+static void alrm_handler (int sig __attribute__((unused)))
{
/* empty */
}