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

diff --git a/imap/util.c b/imap/util.c
index 5c051a6..d2b6002 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -19,6 +19,9 @@
 #include "imap_private.h"
 #include "mutt_ssl.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+
 #include <stdlib.h>
 #include <ctype.h>
 
@@ -175,12 +178,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
@@ -486,7 +489,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);