#include "imap_private.h"
#include "mutt_ssl.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
+
#include <stdlib.h>
#include <ctype.h>
ImapPort = ntohs (service->s_port);
else
ImapPort = IMAP_PORT;
- dprint (3, (debugfile, "Using default IMAP port %d\n", ImapPort));
+ debug_print (3, ("Using default IMAP port %d\n", ImapPort));
}
if (!ImapsPort) {
service = getservbyname ("imaps", "tcp");
ImapsPort = ntohs (service->s_port);
else
ImapsPort = IMAP_SSL_PORT;
- dprint (3, (debugfile, "Using default IMAPS port %d\n", ImapsPort));
+ debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));
}
/* Defaults */
}
if ((n = sscanf (tmp, "%127[^:/]%127s", mx->account.host, tmp)) < 1) {
- dprint (1, (debugfile, "imap_parse_path: NULL host in %s\n", path));
+ debug_print (1, ("NULL host in %s\n", path));
FREE (&mx->mbox);
return -1;
}
if (!ascii_strncmp (tmp, "ssl", 3))
mx->account.flags |= M_ACCT_SSL;
else {
- dprint (1,
- (debugfile,
- "imap_parse_path: Unknown connection type in %s\n", path));
+ debug_print (1, ("Unknown connection type in %s\n", path));
FREE (&mx->mbox);
return -1;
}
if (imap_parse_path (path, &target) < 0)
return;
- tlen = mutt_strlen (target.mbox);
+ tlen = safe_strlen (target.mbox);
/* check whether we can do '=' substitution */
- if (mx_is_imap (Maildir) && !imap_parse_path (Maildir, &home)) {
- hlen = mutt_strlen (home.mbox);
+ if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
+ hlen = safe_strlen (home.mbox);
if (tlen && mutt_account_match (&home.account, &target.account) &&
- !mutt_strncmp (home.mbox, target.mbox, hlen)) {
+ !safe_strncmp (home.mbox, target.mbox, hlen)) {
if (!hlen)
home_match = 1;
else
buf = safe_strdup (s);
if (buf) {
imap_utf7_decode (&buf);
- strncpy (s, buf, mutt_strlen (s));
+ strncpy (s, buf, safe_strlen (s));
}
FREE (&buf);