X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=9c69ebffe278457c13fbe0219860918ba2d9f033;hb=fb514a63a7f58b76577fb30bfa260ad1b9239c41;hp=5c051a6131b40fce75f1c2b76fa5b15e443c5432;hpb=c3e57678c8be193fc137854020f3a90887be97c9;p=apps%2Fmadmutt.git

diff --git a/imap/util.c b/imap/util.c
index 5c051a6..9c69ebf 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -19,6 +19,10 @@
 #include "imap_private.h"
 #include "mutt_ssl.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
+
 #include <stdlib.h>
 #include <ctype.h>
 
@@ -65,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");
@@ -76,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");
@@ -84,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 */
@@ -94,61 +96,19 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
 
   c = safe_strdup (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;
-    }
+  mx->mbox = safe_strdup (url.path);
 
-    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;
-    }
+  if (url.scheme == U_IMAPS)
+    mx->account.flags |= M_ACCT_SSL;
 
-    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;
-        }
-      }
-    }
-  }
+  FREE (&c);
 
 #if defined(USE_SSL) || defined(USE_GNUTLS)
   if (option (OPTIMAPFORCESSL))
@@ -177,10 +137,10 @@ void imap_pretty_mailbox (char *path)
 
   tlen = mutt_strlen (target.mbox);
   /* check whether we can do '=' substitution */
-  if (mx_is_imap (Maildir) && !imap_parse_path (Maildir, &home)) {
+  if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
     hlen = mutt_strlen (home.mbox);
     if (tlen && mutt_account_match (&home.account, &target.account) &&
-        !mutt_strncmp (home.mbox, target.mbox, hlen)) {
+        !safe_strncmp (home.mbox, target.mbox, hlen)) {
       if (!hlen)
         home_match = 1;
       else
@@ -486,7 +446,7 @@ void imap_unmunge_mbox_name (char *s)
   buf = safe_strdup (s);
   if (buf) {
     imap_utf7_decode (&buf);
-    strncpy (s, buf, strlen (s));
+    strncpy (s, buf, mutt_strlen (s));
   }
 
   FREE (&buf);