projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move debug.c
[apps/madmutt.git]
/
mutt_idna.c
diff --git
a/mutt_idna.c
b/mutt_idna.c
index
2665f9c
..
bab9f8f
100644
(file)
--- a/
mutt_idna.c
+++ b/
mutt_idna.c
@@
-11,28
+11,29
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
#include "mutt.h"
#include "charset.h"
#include "mutt_idna.h"
#include "mutt.h"
#include "charset.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/debug.h"
-
/* The low-level interface we use. */
#ifndef HAVE_LIBIDN
int mutt_idna_to_local (const char *in, char **out, int flags)
{
/* The low-level interface we use. */
#ifndef HAVE_LIBIDN
int mutt_idna_to_local (const char *in, char **out, int flags)
{
- *out =
safe_strdup
(in);
+ *out =
m_strdup
(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 =
safe_strdup
(in);
+ *out =
m_strdup
(in);
return 0;
}
return 0;
}
@@
-62,7
+63,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 =
safe_strdup
(*out);
+ char *tmp =
m_strdup
(*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;
@@
-73,8
+74,8
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
irrev = 1;
}
irrev = 1;
}
-
FREE
(&t2);
-
FREE
(&tmp);
+
p_delete
(&t2);
+
p_delete
(&tmp);
if (irrev)
goto notrans;
if (irrev)
goto notrans;
@@
-83,15
+84,15
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
return 0;
notrans:
return 0;
notrans:
-
FREE
(out);
- *out =
safe_strdup
(in);
+
p_delete
(out);
+ *out =
m_strdup
(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 =
safe_strdup
(in);
+ char *tmp =
m_strdup
(in);
*out = NULL;
*out = NULL;
@@
-105,10
+106,10
@@
int mutt_local_to_idna (const char *in, char **out)
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
-
FREE
(&tmp);
+
p_delete
(&tmp);
if (rv < 0) {
if (rv < 0) {
-
FREE
(out);
- *out =
safe_strdup
(in);
+
p_delete
(out);
+ *out =
m_strdup
(in);
}
return rv;
}
}
return rv;
}
@@
-126,15
+127,14
@@
static int mbox_to_udomain (const char *mbx, char **user, char **domain)
*domain = NULL;
p = strchr (mbx, '@');
*domain = NULL;
p = strchr (mbx, '@');
- if (!p)
+ if (!p
|| !p[1]
)
return -1;
return -1;
- *user = safe_calloc ((p - mbx + 1), sizeof (mbx[0]));
- strfcpy (*user, mbx, (p - mbx + 1));
- *domain = safe_strdup (p + 1);
+ *user = p_dupstr(mbx, p - mbx);
+ *domain = m_strdup(p + 1);
return 0;
}
return 0;
}
-int mutt_addrlist_to_idna (
ADDRESS * a,
char **err)
+int mutt_addrlist_to_idna (
address_t * a, const
char **err)
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
@@
-152,16
+152,16
@@
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 =
safe_strdup
(domain);
+ *err =
m_strdup
(domain);
}
else {
}
else {
-
safe_realloc (&a->mailbox, mutt_strlen (user) + mutt_strlen
(tmp) + 2);
+
p_realloc(&a->mailbox, m_strlen(user) + m_strlen
(tmp) + 2);
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
-
FREE
(&domain);
-
FREE
(&user);
-
FREE
(&tmp);
+
p_delete
(&domain);
+
p_delete
(&user);
+
p_delete
(&tmp);
if (e)
return -1;
if (e)
return -1;
@@
-170,7
+170,7
@@
int mutt_addrlist_to_idna (ADDRESS * a, char **err)
return 0;
}
return 0;
}
-int mutt_addrlist_to_local (
ADDRESS
* a)
+int mutt_addrlist_to_local (
address_t
* a)
{
char *user, *domain;
char *tmp = NULL;
{
char *user, *domain;
char *tmp = NULL;
@@
-182,20
+182,20
@@
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_strlen
(tmp) + 2);
+
p_realloc(&a->mailbox, m_strlen(user) + m_strlen
(tmp) + 2);
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
}
-
FREE
(&domain);
-
FREE
(&user);
-
FREE
(&tmp);
+
p_delete
(&domain);
+
p_delete
(&user);
+
p_delete
(&tmp);
}
return 0;
}
/* convert just for displaying purposes */
}
return 0;
}
/* convert just for displaying purposes */
-const char *mutt_addr_for_display (
ADDRESS
* a)
+const char *mutt_addr_for_display (
address_t
* a)
{
static char *buff = NULL;
char *tmp = NULL;
{
static char *buff = NULL;
char *tmp = NULL;
@@
-205,22
+205,22
@@
const char *mutt_addr_for_display (ADDRESS * a)
char *domain = NULL;
char *user = NULL;
char *domain = NULL;
char *user = NULL;
-
FREE
(&buff);
+
p_delete
(&buff);
if (mbox_to_udomain (a->mailbox, &user, &domain) != 0)
return a->mailbox;
if (mutt_idna_to_local (domain, &tmp, MI_MAY_BE_IRREVERSIBLE) != 0) {
if (mbox_to_udomain (a->mailbox, &user, &domain) != 0)
return a->mailbox;
if (mutt_idna_to_local (domain, &tmp, MI_MAY_BE_IRREVERSIBLE) != 0) {
-
FREE
(&user);
-
FREE
(&domain);
-
FREE
(&tmp);
+
p_delete
(&user);
+
p_delete
(&domain);
+
p_delete
(&tmp);
return a->mailbox;
}
return a->mailbox;
}
-
safe_realloc (&buff, mutt_strlen (tmp) + mutt_strlen
(user) + 2);
+
p_realloc(&buff, m_strlen(tmp) + m_strlen
(user) + 2);
sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
-
FREE
(&tmp);
-
FREE
(&user);
-
FREE
(&domain);
+
p_delete
(&tmp);
+
p_delete
(&user);
+
p_delete
(&domain);
return buff;
}
return buff;
}
@@
-247,7
+247,7
@@
void mutt_env_to_local (ENVELOPE * e)
if (tag) *tag = #a; e = 1; err = NULL; \
}
if (tag) *tag = #a; e = 1; err = NULL; \
}
-int mutt_env_to_idna (ENVELOPE * env, c
har **tag,
char **err)
+int mutt_env_to_idna (ENVELOPE * env, c
onst char **tag, const
char **err)
{
int e = 0;
{
int e = 0;