X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fbrowse.c;h=a983c9499736e71baaaca01251442f32eed60708;hp=d9bdf83ddca6d6f85d90ee6dac875fced3021bc6;hb=22601f25ede6703ba7cd06ee84eddd2045308570;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/imap/browse.c b/imap/browse.c
index d9bdf83..a983c94 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -73,8 +73,8 @@ int imap_browse (char *path, struct browser_state *state)
 
   save_lsub = option (OPTIMAPCHECKSUBSCRIBED);
   unset_option (OPTIMAPCHECKSUBSCRIBED);
-  strfcpy (list_cmd, option (OPTIMAPLSUB) ? "LSUB" : "LIST",
-           sizeof (list_cmd));
+  m_strcpy(list_cmd, sizeof(list_cmd),
+           option(OPTIMAPLSUB) ? "LSUB" : "LIST");
 
   if (!(idata = imap_conn_find (&(mx.account), 0)))
     goto fail;
@@ -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));
@@ -260,7 +259,7 @@ int imap_mailbox_create (const char *folder)
     goto fail;
   }
 
-  strfcpy (buf, NONULL (mx.mbox), sizeof (buf));
+  m_strcpy(buf, sizeof(buf), NONULL(mx.mbox));
 
   /* append a delimiter if necessary */
   n = m_strlen(buf);
@@ -366,7 +365,7 @@ static int browse_add_list_result (IMAP_DATA * idata, const char *cmd,
       if (isparent)
         noselect = 1;
       /* prune current folder from output */
-      if (isparent || str_ncmp (name, mx.mbox, m_strlen(name)))
+      if (isparent || m_strncmp(name, mx.mbox, m_strlen(name)))
         imap_add_folder (idata->delim, name, noselect, noinferiors, state,
                          isparent);
     }
@@ -400,12 +399,12 @@ static void imap_add_folder (char delim, char *folder, int noselect,
 
   /* render superiors as unix-standard ".." */
   if (isparent)
-    strfcpy (relpath, "../", sizeof (relpath));
+    m_strcpy(relpath, sizeof(relpath), "../");
   /* strip current folder from target, to render a relative path */
-  else if (!str_ncmp (mx.mbox, folder, m_strlen(mx.mbox)))
-    strfcpy (relpath, folder + m_strlen(mx.mbox), sizeof (relpath));
+  else if (!m_strncmp(mx.mbox, folder, m_strlen(mx.mbox)))
+    m_strcpy(relpath, sizeof(relpath), folder + m_strlen(mx.mbox));
   else
-    strfcpy (relpath, folder, sizeof (relpath));
+    m_strcpy(relpath, sizeof(relpath), folder);
 
   /* apply filemask filter. This should really be done at menu setup rather
    * than at scan, since it's so expensive to scan. But that's big changes