rationalize list handling in mutt a bit.

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

diff --git a/imap/util.c b/imap/util.c
index 8bb4dcf..9a1a9a3 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -14,17 +14,16 @@
 #include "config.h"
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/url.h>
 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
-#include "ascii.h"
-#include "url.h"
 #include "imap_private.h"
-#include "mutt_ssl.h"
+#include <lib-sys/mutt_ssl.h>
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/debug.h"
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -97,7 +96,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
   mx->account.port = ImapPort;
   mx->account.type = M_ACCT_TYPE_IMAP;
 
-  c = str_dup (path);
+  c = m_strdup(path);
   url_parse_ciss (&url, c);
 
   if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
@@ -106,7 +105,7 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
     return -1;
   }
 
-  mx->mbox = str_dup (url.path);
+  mx->mbox = m_strdup(url.path);
 
   if (url.scheme == U_IMAPS)
     mx->account.flags |= M_ACCT_SSL;
@@ -133,12 +132,12 @@ void imap_pretty_mailbox (char *path)
   if (imap_parse_path (path, &target) < 0)
     return;
 
-  tlen = str_len (target.mbox);
+  tlen = m_strlen(target.mbox);
   /* check whether we can do '=' substitution */
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
-    hlen = str_len (home.mbox);
+    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
@@ -201,7 +200,7 @@ void imap_free_idata (IMAP_DATA ** idata)
     return;
 
   p_delete(&(*idata)->capstr);
-  mutt_free_list (&(*idata)->flags);
+  string_list_wipe(&(*idata)->flags);
   p_delete(&((*idata)->cmd.buf));
   p_delete(idata);
 }
@@ -220,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;
   }
 
@@ -293,8 +292,7 @@ char *imap_next_word (char *s)
     s++;
   }
 
-  SKIPWS (s);
-  return s;
+  return vskipspaces(s);
 }
 
 /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
@@ -427,7 +425,7 @@ void imap_munge_mbox_name (char *dest, size_t dlen, const char *src)
 {
   char *buf;
 
-  buf = str_dup (src);
+  buf = m_strdup(src);
   imap_utf7_encode (&buf);
 
   imap_quote_string (dest, dlen, buf);
@@ -441,10 +439,10 @@ void imap_unmunge_mbox_name (char *s)
 
   imap_unquote_string (s);
 
-  buf = str_dup (s);
+  buf = m_strdup(s);
   if (buf) {
     imap_utf7_decode (&buf);
-    strncpy (s, buf, str_len (s));
+    m_strcpy(s, m_strlen(s) + 1, buf);
   }
 
   p_delete(&buf);