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]
/
mutt_idna.c
diff --git
a/mutt_idna.c
b/mutt_idna.c
index
2665f9c
..
4b42e32
100644
(file)
--- a/
mutt_idna.c
+++ b/
mutt_idna.c
@@
-26,13
+26,13
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
{
int mutt_idna_to_local (const char *in, char **out, int flags)
{
- *out = s
afe_str
dup (in);
+ *out = s
tr_
dup (in);
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
- *out = s
afe_str
dup (in);
+ *out = s
tr_
dup (in);
return 0;
}
return 0;
}
@@
-62,7
+62,7
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
int irrev = 0;
char *t2 = NULL;
if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
int irrev = 0;
char *t2 = NULL;
- char *tmp = s
afe_str
dup (*out);
+ char *tmp = s
tr_
dup (*out);
if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
irrev = 1;
if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
irrev = 1;
@@
-84,14
+84,14
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
notrans:
FREE (out);
notrans:
FREE (out);
- *out = s
afe_str
dup (in);
+ *out = s
tr_
dup (in);
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
int rv = 0;
return 1;
}
int mutt_local_to_idna (const char *in, char **out)
{
int rv = 0;
- char *tmp = s
afe_str
dup (in);
+ char *tmp = s
tr_
dup (in);
*out = NULL;
*out = NULL;
@@
-108,7
+108,7
@@
int mutt_local_to_idna (const char *in, char **out)
FREE (&tmp);
if (rv < 0) {
FREE (out);
FREE (&tmp);
if (rv < 0) {
FREE (out);
- *out = s
afe_str
dup (in);
+ *out = s
tr_
dup (in);
}
return rv;
}
}
return rv;
}
@@
-130,7
+130,7
@@
static int mbox_to_udomain (const char *mbx, char **user, char **domain)
return -1;
*user = safe_calloc ((p - mbx + 1), sizeof (mbx[0]));
strfcpy (*user, mbx, (p - mbx + 1));
return -1;
*user = safe_calloc ((p - mbx + 1), sizeof (mbx[0]));
strfcpy (*user, mbx, (p - mbx + 1));
- *domain = s
afe_str
dup (p + 1);
+ *domain = s
tr_
dup (p + 1);
return 0;
}
return 0;
}
@@
-152,10
+152,10
@@
int mutt_addrlist_to_idna (ADDRESS * a, char **err)
if (mutt_local_to_idna (domain, &tmp) < 0) {
e = 1;
if (err)
if (mutt_local_to_idna (domain, &tmp) < 0) {
e = 1;
if (err)
- *err = s
afe_str
dup (domain);
+ *err = s
tr_
dup (domain);
}
else {
}
else {
- safe_realloc (&a->mailbox,
mutt_strlen (user) + mutt_str
len (tmp) + 2);
+ safe_realloc (&a->mailbox,
str_len (user) + str_
len (tmp) + 2);
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
@@
-182,7
+182,7
@@
int mutt_addrlist_to_local (ADDRESS * a)
continue;
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
continue;
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
- safe_realloc (&a->mailbox,
mutt_strlen (user) + mutt_str
len (tmp) + 2);
+ safe_realloc (&a->mailbox,
str_len (user) + str_
len (tmp) + 2);
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
@@
-216,7
+216,7
@@
const char *mutt_addr_for_display (ADDRESS * a)
return a->mailbox;
}
return a->mailbox;
}
- safe_realloc (&buff,
mutt_strlen (tmp) + mutt_str
len (user) + 2);
+ safe_realloc (&buff,
str_len (tmp) + str_
len (user) + 2);
sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
FREE (&tmp);
FREE (&user);
sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
FREE (&tmp);
FREE (&user);