drop openssl support as well, only use GNUTLS.

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

diff --git a/imap/util.c b/imap/util.c
index d7837e1..d48101b 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -14,39 +14,13 @@
 #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 -- */
 
-/* imap_expand_path: IMAP implementation of mutt_expand_path. Rewrite
- *   an IMAP path in canonical and absolute form.
- * Inputs: a buffer containing an IMAP path, and the number of bytes in
- *   that buffer.
- * Outputs: The buffer is rewritten in place with the canonical IMAP path.
- * Returns 0 on success, or -1 if imap_parse_path chokes or url_ciss_tostring
- *   fails, which it might if there isn't enough room in the buffer. */
-int imap_expand_path (char *path, size_t len)
-{
-  IMAP_MBOX mx;
-  ciss_url_t url;
-  int rc;
-
-  if (imap_parse_path (path, &mx) < 0)
-    return -1;
-
-  mutt_account_tourl (&mx.account, &url);
-  url.path = mx.mbox;
-
-  rc = url_ciss_tostring (&url, path, len, U_DECODE_PASSWD);
-  p_delete(&mx.mbox);
-
-  return rc;
-}
-
 /* imap_parse_path: given an IMAP mailbox name, return host, port
  *   and a path IMAP servers will recognise.
  * mx.mbox is malloc'd, caller must free it */
@@ -283,45 +257,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;
 
@@ -433,12 +393,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;