X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=328a86e00db0514d983049f12fe0379eeac0a7f1;hb=0f73e7417ede147d1a67a8fbed1ba6d2ba9b5297;hp=8a2b3aabfa46497ad32f2a9f2679ac111c5716b2;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281;p=apps%2Fmadmutt.git

diff --git a/imap/util.c b/imap/util.c
index 8a2b3aa..328a86e 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -1,21 +1,12 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-8 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
  * Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* general IMAP utility functions */
@@ -28,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>
 
@@ -85,7 +80,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");
@@ -93,7 +88,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 */
@@ -137,7 +132,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
     }
 
     if ((n = sscanf (tmp, "%127[^:/]%127s", mx->account.host, tmp)) < 1) {
-      dprint (1, (debugfile, "imap_parse_path: NULL host in %s\n", path));
+      debug_print (1, ("NULL host in %s\n", path));
       FREE (&mx->mbox);
       return -1;
     }
@@ -149,9 +144,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
         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));
+          debug_print (1, ("Unknown connection type in %s\n", path));
           FREE (&mx->mbox);
           return -1;
         }
@@ -184,12 +177,12 @@ void imap_pretty_mailbox (char *path)
   if (imap_parse_path (path, &target) < 0)
     return;
 
-  tlen = mutt_strlen (target.mbox);
+  tlen = safe_strlen (target.mbox);
   /* check whether we can do '=' substitution */
-  if (mx_is_imap (Maildir) && !imap_parse_path (Maildir, &home)) {
-    hlen = mutt_strlen (home.mbox);
+  if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
+    hlen = safe_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
@@ -495,7 +488,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, safe_strlen (s));
   }
 
   FREE (&buf);