projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
imap
/
util.c
diff --git
a/imap/util.c
b/imap/util.c
index
2893f4f
..
0e842b1
100644
(file)
--- a/
imap/util.c
+++ b/
imap/util.c
@@
-94,7
+94,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
mx->account.port = ImapPort;
mx->account.type = M_ACCT_TYPE_IMAP;
mx->account.port = ImapPort;
mx->account.type = M_ACCT_TYPE_IMAP;
- c = s
afe_str
dup (path);
+ c = s
tr_
dup (path);
url_parse_ciss (&url, c);
if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
url_parse_ciss (&url, c);
if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
@@
-103,18
+103,13
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
return -1;
}
return -1;
}
- mx->mbox = s
afe_str
dup (url.path);
+ mx->mbox = s
tr_
dup (url.path);
if (url.scheme == U_IMAPS)
mx->account.flags |= M_ACCT_SSL;
FREE (&c);
if (url.scheme == U_IMAPS)
mx->account.flags |= M_ACCT_SSL;
FREE (&c);
-#if defined(USE_SSL) || defined(USE_GNUTLS)
- if (option (OPTIMAPFORCESSL))
- mx->account.flags |= M_ACCT_SSL;
-#endif
-
if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT))
mx->account.port = ImapsPort;
if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT))
mx->account.port = ImapsPort;
@@
-135,12
+130,12
@@
void imap_pretty_mailbox (char *path)
if (imap_parse_path (path, &target) < 0)
return;
if (imap_parse_path (path, &target) < 0)
return;
- tlen = s
afe_str
len (target.mbox);
+ tlen = s
tr_
len (target.mbox);
/* check whether we can do '=' substitution */
if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
/* check whether we can do '=' substitution */
if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
- hlen = s
afe_str
len (home.mbox);
+ hlen = s
tr_
len (home.mbox);
if (tlen && mutt_account_match (&home.account, &target.account) &&
if (tlen && mutt_account_match (&home.account, &target.account) &&
- !s
afe_str
ncmp (home.mbox, target.mbox, hlen)) {
+ !s
tr_
ncmp (home.mbox, target.mbox, hlen)) {
if (!hlen)
home_match = 1;
else
if (!hlen)
home_match = 1;
else
@@
-429,7
+424,7
@@
void imap_munge_mbox_name (char *dest, size_t dlen, const char *src)
{
char *buf;
{
char *buf;
- buf = s
afe_str
dup (src);
+ buf = s
tr_
dup (src);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
imap_utf7_encode (&buf);
imap_quote_string (dest, dlen, buf);
@@
-443,10
+438,10
@@
void imap_unmunge_mbox_name (char *s)
imap_unquote_string (s);
imap_unquote_string (s);
- buf = s
afe_str
dup (s);
+ buf = s
tr_
dup (s);
if (buf) {
imap_utf7_decode (&buf);
if (buf) {
imap_utf7_decode (&buf);
- strncpy (s, buf, s
afe_str
len (s));
+ strncpy (s, buf, s
tr_
len (s));
}
FREE (&buf);
}
FREE (&buf);