X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fbrowse.c;fp=imap%2Fbrowse.c;h=a983c9499736e71baaaca01251442f32eed60708;hp=9025dab31df410d02c0690c8eb8dfa2f623b246e;hb=238b70e39b78f585c586bd51aef41988b3cc73d1;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/imap/browse.c b/imap/browse.c
index 9025dab..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;
@@ -259,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);
@@ -399,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 (!m_strncmp(mx.mbox, folder, m_strlen(mx.mbox)))
-    strfcpy (relpath, folder + m_strlen(mx.mbox), sizeof (relpath));
+    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