#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"
+#include <lib-network/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>
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) ||
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;
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
int x = 0;
if (!mailbox || !*mailbox) {
- strfcpy (path, "INBOX", plen);
+ m_strcpy(path, plen, "INBOX");
return path;
}
s++;
}
- SKIPWS (s);
- return s;
+ return vskipspaces(s);
}
/* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
{
char *buf;
- buf = str_dup (src);
+ buf = m_strdup(src);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
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);