X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=4fe8ee8c073e61aee4c5b9ad2413c92deac76d72;hp=abcbe2be39c1e868087c615caf2fa08c7b3f85cd;hb=87f0ade5709ed7f08271f6e73dec2112d96bfc97;hpb=ac1ea3143e61def7fc9000bee6d0d59d56c5b997

diff --git a/imap/util.c b/imap/util.c
index abcbe2b..4fe8ee8 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -14,11 +14,10 @@
 #include <lib-lib/lib-lib.h>
 #include <signal.h>
 #include <netdb.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"                 /* for M_IMAP */
 #include "imap_private.h"
-#include <lib-sys/mutt_ssl.h>
 
 /* -- public functions -- */
 
@@ -147,19 +146,20 @@ 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);
+  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 +258,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;
 
@@ -408,12 +394,12 @@ void imap_unmunge_mbox_name (char *s)
 /* imap_wordcasecmp: find word a in word list b */
 int imap_wordcasecmp (const char *a, const char *b)
 {
-  char tmp[SHORT_STRING];
+  char tmp[STRING];
   char *s = (char *) b;
   int i;
 
-  tmp[SHORT_STRING - 1] = 0;
-  for (i = 0; i < SHORT_STRING - 2; i++, s++) {
+  tmp[STRING - 1] = 0;
+  for (i = 0; i < STRING - 2; i++, s++) {
     if (!*s || ISSPACE (*s)) {
       tmp[i] = 0;
       break;
@@ -431,7 +417,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 */
 }