projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
imap
/
util.c
diff --git
a/imap/util.c
b/imap/util.c
index
9a632a5
..
328a86e
100644
(file)
--- a/
imap/util.c
+++ b/
imap/util.c
@@
-21,6
+21,7
@@
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/mem.h"
#include "lib/intl.h"
+#include "lib/debug.h"
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
@@
-79,7
+80,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
ImapPort = ntohs (service->s_port);
else
ImapPort = IMAP_PORT;
ImapPort = ntohs (service->s_port);
else
ImapPort = IMAP_PORT;
- d
print (3, (debugfile,
"Using default IMAP port %d\n", ImapPort));
+ d
ebug_print (3, (
"Using default IMAP port %d\n", ImapPort));
}
if (!ImapsPort) {
service = getservbyname ("imaps", "tcp");
}
if (!ImapsPort) {
service = getservbyname ("imaps", "tcp");
@@
-87,7
+88,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
ImapsPort = ntohs (service->s_port);
else
ImapsPort = IMAP_SSL_PORT;
ImapsPort = ntohs (service->s_port);
else
ImapsPort = IMAP_SSL_PORT;
- d
print (3, (debugfile,
"Using default IMAPS port %d\n", ImapsPort));
+ d
ebug_print (3, (
"Using default IMAPS port %d\n", ImapsPort));
}
/* Defaults */
}
/* Defaults */
@@
-131,7
+132,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
}
if ((n = sscanf (tmp, "%127[^:/]%127s", mx->account.host, tmp)) < 1) {
}
if ((n = sscanf (tmp, "%127[^:/]%127s", mx->account.host, tmp)) < 1) {
- d
print (1, (debugfile, "imap_parse_path:
NULL host in %s\n", path));
+ d
ebug_print (1, ("
NULL host in %s\n", path));
FREE (&mx->mbox);
return -1;
}
FREE (&mx->mbox);
return -1;
}
@@
-143,9
+144,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
if (!ascii_strncmp (tmp, "ssl", 3))
mx->account.flags |= M_ACCT_SSL;
else {
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;
}
FREE (&mx->mbox);
return -1;
}
@@
-178,12
+177,12
@@
void imap_pretty_mailbox (char *path)
if (imap_parse_path (path, &target) < 0)
return;
if (imap_parse_path (path, &target) < 0)
return;
- tlen =
mutt
_strlen (target.mbox);
+ tlen =
safe
_strlen (target.mbox);
/* check whether we can do '=' substitution */
/* 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) &&
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
if (!hlen)
home_match = 1;
else
@@
-489,7
+488,7
@@
void imap_unmunge_mbox_name (char *s)
buf = safe_strdup (s);
if (buf) {
imap_utf7_decode (&buf);
buf = safe_strdup (s);
if (buf) {
imap_utf7_decode (&buf);
- strncpy (s, buf,
mutt
_strlen (s));
+ strncpy (s, buf,
safe
_strlen (s));
}
FREE (&buf);
}
FREE (&buf);