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
5c051a6
..
d2b6002
100644
(file)
--- a/
imap/util.c
+++ b/
imap/util.c
@@
-19,6
+19,9
@@
#include "imap_private.h"
#include "mutt_ssl.h"
#include "imap_private.h"
#include "mutt_ssl.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
@@
-175,12
+178,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
@@
-486,7
+489,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, strlen (s));
+ strncpy (s, buf, s
afe_s
trlen (s));
}
FREE (&buf);
}
FREE (&buf);