X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fbrowse.c;h=1a92a693bed3298fa25a3c584e9ffebb0fb83004;hb=659b43f9de9609d63533ddbbe2f4ac6641d877d2;hp=b9d9220a17fd23b88f9881ea43b27fbd65e23508;hpb=c3e57678c8be193fc137854020f3a90887be97c9;p=apps%2Fmadmutt.git

diff --git a/imap/browse.c b/imap/browse.c
index b9d9220..1a92a69 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -17,6 +17,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/intl.h"
+
 #include "mutt.h"
 #include "imap_private.h"
 
@@ -111,7 +115,7 @@ int imap_browse (char *path, struct browser_state *state)
           imap_unmunge_mbox_name (cur_folder);
 
           if (!noinferiors && cur_folder[0] &&
-              (n = strlen (mbox)) < LONG_STRING - 1) {
+              (n = mutt_strlen (mbox)) < LONG_STRING - 1) {
             mbox[n++] = idata->delim;
             mbox[n] = '\0';
           }
@@ -362,7 +366,7 @@ static int browse_add_list_result (IMAP_DATA * idata, const char *cmd,
       if (isparent)
         noselect = 1;
       /* prune current folder from output */
-      if (isparent || mutt_strncmp (name, mx.mbox, strlen (name)))
+      if (isparent || mutt_strncmp (name, mx.mbox, mutt_strlen (name)))
         imap_add_folder (idata->delim, name, noselect, noinferiors, state,
                          isparent);
     }
@@ -417,9 +421,9 @@ static void imap_add_folder (char delim, char *folder, int noselect,
   (state->entry)[state->entrylen].name = safe_strdup (tmp);
 
   /* mark desc with delim in browser if it can have subfolders */
-  if (!isparent && !noinferiors && strlen (relpath) < sizeof (relpath) - 1) {
-    relpath[strlen (relpath) + 1] = '\0';
-    relpath[strlen (relpath)] = delim;
+  if (!isparent && !noinferiors && mutt_strlen (relpath) < sizeof (relpath) - 1) {
+    relpath[mutt_strlen (relpath) + 1] = '\0';
+    relpath[mutt_strlen (relpath)] = delim;
   }
 
   (state->entry)[state->entrylen].desc = safe_strdup (relpath);