X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=4bef04b056693f26542d4cdf561b5199d36af543;hp=992423e70af44e16099a6e95a5c1653d53072a67;hb=238b70e39b78f585c586bd51aef41988b3cc73d1;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/imap/util.c b/imap/util.c
index 992423e..4bef04b 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -14,10 +14,10 @@
 #include "config.h"
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
-#include "ascii.h"
 #include "url.h"
 #include "imap_private.h"
 #include "mutt_ssl.h"
@@ -137,7 +137,7 @@ void imap_pretty_mailbox (char *path)
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
     hlen = m_strlen(home.mbox);
     if (tlen && mutt_account_match (&home.account, &target.account) &&
-        !str_ncmp (home.mbox, target.mbox, hlen)) {
+        !m_strncmp(home.mbox, target.mbox, hlen)) {
       if (!hlen)
         home_match = 1;
       else
@@ -219,7 +219,7 @@ char *imap_fix_path (IMAP_DATA * idata, char *mailbox, char *path,
   int x = 0;
 
   if (!mailbox || !*mailbox) {
-    strfcpy (path, "INBOX", plen);
+    m_strcpy(path, plen, "INBOX");
     return path;
   }
 
@@ -443,7 +443,7 @@ void imap_unmunge_mbox_name (char *s)
   buf = m_strdup(s);
   if (buf) {
     imap_utf7_decode (&buf);
-    strncpy (s, buf, m_strlen(s));
+    m_strcpy(s, m_strlen(s) + 1, buf);
   }
 
   p_delete(&buf);