X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fbrowse.c;h=54d608b79638b8f3b57ff748a46155bf8589b4e3;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hp=2ee4bffc7d5c693da4343498ee840a651a21d1e3;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd;p=apps%2Fmadmutt.git

diff --git a/imap/browse.c b/imap/browse.c
index 2ee4bff..54d608b 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -19,12 +19,12 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 
 #include "lib/debug.h"
 
 #include "mutt.h"
-#include "ascii.h"
 #include "enter.h"
 #include "imap_private.h"
 
@@ -101,8 +101,7 @@ int imap_browse (char *path, struct browser_state *state)
     imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
     imap_munge_mbox_name (buf, sizeof (buf), mbox);
     imap_unquote_string (buf);  /* As kludgy as it gets */
-    mbox[sizeof (mbox) - 1] = '\0';
-    strncpy (mbox, buf, sizeof (mbox) - 1);
+    m_strcpy(mbox, sizeof(mbox), buf);
     n = m_strlen(mbox);
 
     debug_print (3, ("mbox: %s\n", mbox));
@@ -440,7 +439,7 @@ static void imap_add_folder (char delim, char *folder, int noselect,
 
 static int compare_names (struct folder_file *a, struct folder_file *b)
 {
-  return str_cmp (a->name, b->name);
+  return m_strcmp(a->name, b->name);
 }
 
 static int browse_get_namespace (IMAP_DATA * idata, char *nsbuf, int nsblen,