X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fbrowse.c;h=54d608b79638b8f3b57ff748a46155bf8589b4e3;hb=b07d69b15852a06183f7b2298436e18150c36958;hp=68974a2cca3b762c511ad1b69de473d5466b4e11;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199;p=apps%2Fmadmutt.git

diff --git a/imap/browse.c b/imap/browse.c
index 68974a2..54d608b 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -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,