X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=230f005590e918e9aad3c45e12c1c72b25868e2b;hb=8c3ace92538b826576b892108b8f5eb6d68e62cc;hp=3f14b787e3a3e2a974d30fee3137ce3dc4373937;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638;p=apps%2Fmadmutt.git

diff --git a/imap/util.c b/imap/util.c
index 3f14b78..230f005 100644
--- 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);
+    }
 }
 
 /*
@@ -258,45 +259,31 @@ 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 != '-')
+  t.tm_mday = strtol(s, &s, 10);
+  if (*s++ != '-')
     return 0;
-  s++;
-  t.tm_mon = mutt_check_month (s);
+  t.tm_mon = mutt_check_month(s);
   s += 3;
-  if (*s != '-')
+  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 != ' ')
+  t.tm_year = strtol(s, &s, 10) - 1900;
+  if (*s++ != ' ')
     return 0;
-  s++;
 
   /* time */
-  t.tm_hour = (s[0] - '0') * 10 + (s[1] - '0');
-  s += 2;
-  if (*s != ':')
+  t.tm_hour = strtol(s, &s, 10);
+  if (*s++ != ':')
     return 0;
-  s++;
-  t.tm_min = (s[0] - '0') * 10 + (s[1] - '0');
-  s += 2;
-  if (*s != ':')
+  t.tm_min = strtol(s, &s, 10);
+  if (*s++ != ':')
     return 0;
-  s++;
-  t.tm_sec = (s[0] - '0') * 10 + (s[1] - '0');
-  s += 2;
-  if (*s != ' ')
+  t.tm_sec = strtol(s, &s, 10);
+  if (*s++ != ' ')
     return 0;
-  s++;
 
   /* timezone */
-  tz = ((s[1] - '0') * 10 + (s[2] - '0')) * 3600 +
-    ((s[3] - '0') * 10 + (s[4] - '0')) * 60;
+  tz = strtol(s + 1, NULL, 10);
+  tz = (tz / 100) * 3600 + (tz % 100) * 60;
   if (s[0] == '+')
     tz = -tz;
 
@@ -431,7 +418,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 */
 }