Rocco Rutte:

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

diff --git a/imap/util.c b/imap/util.c
index d2b6002..0e842b1 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -21,6 +21,7 @@
 
 #include "lib/mem.h"
 #include "lib/intl.h"
+#include "lib/debug.h"
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -68,10 +69,8 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
   static unsigned short ImapPort = 0;
   static unsigned short ImapsPort = 0;
   struct servent *service;
-  char tmp[128];
   ciss_url_t url;
   char *c;
-  int n;
 
   if (!ImapPort) {
     service = getservbyname ("imap", "tcp");
@@ -79,7 +78,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapPort = ntohs (service->s_port);
     else
       ImapPort = IMAP_PORT;
-    dprint (3, (debugfile, "Using default IMAP port %d\n", ImapPort));
+    debug_print (3, ("Using default IMAP port %d\n", ImapPort));
   }
   if (!ImapsPort) {
     service = getservbyname ("imaps", "tcp");
@@ -87,7 +86,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapsPort = ntohs (service->s_port);
     else
       ImapsPort = IMAP_SSL_PORT;
-    dprint (3, (debugfile, "Using default IMAPS port %d\n", ImapsPort));
+    debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));
   }
 
   /* Defaults */
@@ -95,68 +94,21 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
   mx->account.port = ImapPort;
   mx->account.type = M_ACCT_TYPE_IMAP;
 
-  c = safe_strdup (path);
+  c = str_dup (path);
   url_parse_ciss (&url, c);
-  if (url.scheme == U_IMAP || url.scheme == U_IMAPS) {
-    if (mutt_account_fromurl (&mx->account, &url) < 0) {
-      FREE (&c);
-      return -1;
-    }
-
-    mx->mbox = safe_strdup (url.path);
-
-    if (url.scheme == U_IMAPS)
-      mx->account.flags |= M_ACCT_SSL;
 
+  if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
+      mutt_account_fromurl (&mx->account, &url) < 0) {
     FREE (&c);
+    return -1;
   }
-  /* old PINE-compatibility code */
-  else {
-    FREE (&c);
-    if (sscanf (path, "{%127[^}]}", tmp) != 1)
-      return -1;
-
-    c = strchr (path, '}');
-    if (!c)
-      return -1;
-    else
-      /* walk past closing '}' */
-      mx->mbox = safe_strdup (c + 1);
-
-    if ((c = strrchr (tmp, '@'))) {
-      *c = '\0';
-      strfcpy (mx->account.user, tmp, sizeof (mx->account.user));
-      strfcpy (tmp, c + 1, sizeof (tmp));
-      mx->account.flags |= M_ACCT_USER;
-    }
 
-    if ((n = sscanf (tmp, "%127[^:/]%127s", mx->account.host, tmp)) < 1) {
-      dprint (1, (debugfile, "imap_parse_path: NULL host in %s\n", path));
-      FREE (&mx->mbox);
-      return -1;
-    }
+  mx->mbox = str_dup (url.path);
 
-    if (n > 1) {
-      if (sscanf (tmp, ":%hu%127s", &(mx->account.port), tmp) >= 1)
-        mx->account.flags |= M_ACCT_PORT;
-      if (sscanf (tmp, "/%s", tmp) == 1) {
-        if (!ascii_strncmp (tmp, "ssl", 3))
-          mx->account.flags |= M_ACCT_SSL;
-        else {
-          dprint (1,
-                  (debugfile,
-                   "imap_parse_path: Unknown connection type in %s\n", path));
-          FREE (&mx->mbox);
-          return -1;
-        }
-      }
-    }
-  }
-
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-  if (option (OPTIMAPFORCESSL))
+  if (url.scheme == U_IMAPS)
     mx->account.flags |= M_ACCT_SSL;
-#endif
+
+  FREE (&c);
 
   if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT))
     mx->account.port = ImapsPort;
@@ -178,12 +130,12 @@ void imap_pretty_mailbox (char *path)
   if (imap_parse_path (path, &target) < 0)
     return;
 
-  tlen = safe_strlen (target.mbox);
+  tlen = str_len (target.mbox);
   /* check whether we can do '=' substitution */
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
-    hlen = safe_strlen (home.mbox);
+    hlen = str_len (home.mbox);
     if (tlen && mutt_account_match (&home.account, &target.account) &&
-        !safe_strncmp (home.mbox, target.mbox, hlen)) {
+        !str_ncmp (home.mbox, target.mbox, hlen)) {
       if (!hlen)
         home_match = 1;
       else
@@ -472,7 +424,7 @@ void imap_munge_mbox_name (char *dest, size_t dlen, const char *src)
 {
   char *buf;
 
-  buf = safe_strdup (src);
+  buf = str_dup (src);
   imap_utf7_encode (&buf);
 
   imap_quote_string (dest, dlen, buf);
@@ -486,10 +438,10 @@ void imap_unmunge_mbox_name (char *s)
 
   imap_unquote_string (s);
 
-  buf = safe_strdup (s);
+  buf = str_dup (s);
   if (buf) {
     imap_utf7_decode (&buf);
-    strncpy (s, buf, safe_strlen (s));
+    strncpy (s, buf, str_len (s));
   }
 
   FREE (&buf);