make m_dupstr return NULL if the string was empty.

[apps/madmutt.git] / imap / browse.c

diff --git a/imap/browse.c b/imap/browse.c
index 2ee4bff..54d608b 100644 (file)
--- 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,