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
96d33d2
..
bab9f8f
100644
(file)
--- a/
mutt_idna.c
+++ b/
mutt_idna.c
@@
-12,29
+12,28
@@
#endif
#include <lib-lib/mem.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 "mutt.h"
-#include "ascii.h"
#include "charset.h"
#include "mutt_idna.h"
#include "charset.h"
#include "mutt_idna.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 =
str_dup
(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 =
str_dup
(in);
+ *out =
m_strdup
(in);
return 0;
}
return 0;
}
@@
-64,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 =
str_dup
(*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;
@@
-86,14
+85,14
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
notrans:
p_delete(out);
notrans:
p_delete(out);
- *out =
str_dup
(in);
+ *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 =
str_dup
(in);
+ char *tmp =
m_strdup
(in);
*out = NULL;
*out = NULL;
@@
-110,7
+109,7
@@
int mutt_local_to_idna (const char *in, char **out)
p_delete(&tmp);
if (rv < 0) {
p_delete(out);
p_delete(&tmp);
if (rv < 0) {
p_delete(out);
- *out =
str_dup
(in);
+ *out =
m_strdup
(in);
}
return rv;
}
}
return rv;
}
@@
-131,11
+130,11
@@
static int mbox_to_udomain (const char *mbx, char **user, char **domain)
if (!p || !p[1])
return -1;
*user = p_dupstr(mbx, p - mbx);
if (!p || !p[1])
return -1;
*user = p_dupstr(mbx, p - mbx);
- *domain =
str_dup
(p + 1);
+ *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;
@@
-153,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 =
str_dup
(domain);
+ *err =
m_strdup
(domain);
}
else {
}
else {
- p_realloc(&a->mailbox,
str_len(user) + str_
len(tmp) + 2);
+ p_realloc(&a->mailbox,
m_strlen(user) + m_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__ */
}
@@
-171,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;
@@
-183,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) {
- p_realloc(&a->mailbox,
str_len(user) + str_
len(tmp) + 2);
+ p_realloc(&a->mailbox,
m_strlen(user) + m_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__ */
}
@@
-196,7
+195,7
@@
int mutt_addrlist_to_local (ADDRESS * a)
}
/* convert just for displaying purposes */
}
/* 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;
@@
-217,7
+216,7
@@
const char *mutt_addr_for_display (ADDRESS * a)
return a->mailbox;
}
return a->mailbox;
}
- p_realloc(&buff,
str_len(tmp) + str_
len(user) + 2);
+ p_realloc(&buff,
m_strlen(tmp) + m_str
len(user) + 2);
sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
p_delete(&tmp);
p_delete(&user);
sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
p_delete(&tmp);
p_delete(&user);