projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctors/dtors for BODY's
[apps/madmutt.git]
/
mutt_idna.c
diff --git
a/mutt_idna.c
b/mutt_idna.c
index
4b160f2
..
2950ff5
100644
(file)
--- a/
mutt_idna.c
+++ b/
mutt_idna.c
@@
-11,17
+11,19
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
+
#include <lib-lib/mem.h>
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "charset.h"
#include "mutt_idna.h"
#include "charset.h"
#include "mutt_idna.h"
-#include "lib/debug.h"
-
/* The low-level interface we use. */
#ifndef HAVE_LIBIDN
/* The low-level interface we use. */
#ifndef HAVE_LIBIDN
@@
-71,7
+73,6
@@
int mutt_idna_to_local (const char *in, char **out, int flags)
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
if (!irrev && ascii_strcasecmp (t2, in)) {
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
if (!irrev && ascii_strcasecmp (t2, in)) {
- debug_print (1, ("not reversible. in = '%s', t2 = '%s'.\n", in, t2));
irrev = 1;
}
irrev = 1;
}
@@
-135,7
+136,7
@@
static int mbox_to_udomain (const char *mbx, char **user, char **domain)
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;
@@
-171,7
+172,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;
@@
-196,7
+197,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;