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

diff --git a/imap/browse.c b/imap/browse.c
index 9025dab..65f94f2 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -21,11 +21,12 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/enter.h>
 
-#include "lib/debug.h"
 
 #include "mutt.h"
-#include "enter.h"
 #include "imap_private.h"
 
 /* -- forward declarations -- */
@@ -73,8 +74,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 +260,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 +400,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