remove yet anoter round of str_* functions, replaced with their inlineable

[apps/madmutt.git] / imap / util.c

diff --git a/imap/util.c b/imap/util.c
index 63dd769..5ca2fad 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -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
@@ -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);