Use str[pf]time.

[apps/madmutt.git] / imap / util.c

diff --git a/imap/util.c b/imap/util.c
index ba05df1..16aa75f 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -18,7 +18,6 @@
 
 #include "mutt.h"
 #include "imap_private.h"
-#include <lib-sys/mutt_ssl.h>
 
 /* -- public functions -- */
 
@@ -65,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;
@@ -147,19 +146,21 @@ void imap_error (const char *where, const char *msg)
  *   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);
+    }
 }
 
 /*
@@ -255,38 +256,15 @@ 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;
+    time_t tz;
+
+    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
@@ -417,7 +395,7 @@ int imap_wordcasecmp (const char *a, const char *b)
  * 
  */
 
-static RETSIGTYPE alrm_handler (int sig __attribute__((unused)))
+static void alrm_handler (int sig __attribute__((unused)))
 {
   /* empty */
 }