* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
#include "mutt.h"
#include "charset.h"
/* The low-level interface we use. */
-#ifndef HAVE_LIBIDN
-
-int mutt_idna_to_local (const char *in, char **out, int flags)
-{
- *out = m_strdup(in);
- return 1;
-}
-
-int mutt_local_to_idna (const char *in, char **out)
-{
- *out = m_strdup(in);
- return 0;
-}
-
-#else
-
-int mutt_idna_to_local (const char *in, char **out, int flags)
+static int mutt_idna_to_local (const char *in, char **out, int flags)
{
+#ifdef HAVE_LIBIDN
*out = NULL;
if (!option (OPTUSEIDN))
/* Is this the right function? Interesting effects with some bad identifiers! */
if (idna_to_unicode_8z8z (in, out, 1) != IDNA_SUCCESS)
goto notrans;
- if (mutt_convert_string (out, "utf-8", Charset, M_ICONV_HOOK_TO) == -1)
+ if (mutt_convert_string (out, "utf-8", MCharset.charset, M_ICONV_HOOK_TO) == -1)
goto notrans;
/*
char *t2 = NULL;
char *tmp = m_strdup(*out);
- if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
irrev = 1;
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
notrans:
p_delete(out);
+#endif
*out = m_strdup(in);
return 1;
}
-int mutt_local_to_idna (const char *in, char **out)
+static int mutt_local_to_idna (const char *in, char **out)
{
+#ifdef HAVE_LIBIDN
int rv = 0;
char *tmp = m_strdup(in);
return -1;
}
- if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
rv = -1;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
*out = m_strdup(in);
}
return rv;
-}
-
+#else
+ *out = m_strdup(in);
+ return 0;
#endif
-
+}
/* higher level functions */
return 0;
}
-int mutt_addrlist_to_idna (address_t * a, const char **err)
+int mutt_addrlist_to_idna (address_t * a, char **err)
{
char *user = NULL, *domain = NULL;
char *tmp = NULL;
}
else {
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));
}
p_delete(&domain);
if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
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));
}
p_delete(&domain);
}
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));
p_delete(&tmp);
p_delete(&user);
p_delete(&domain);
if (tag) *tag = #a; e = 1; err = NULL; \
}
-int mutt_env_to_idna (ENVELOPE * env, const char **tag, const char **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, char **err)
{
int e = 0;