/* The low-level interface we use. */
-static int mutt_idna_to_local (const char *in, char **out, int flags)
+static int mutt_idna_to_local(const char *in, char **out, bool nonreverseok)
{
#ifdef HAVE_LIBIDN
*out = NULL;
/* 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", MCharset.charset, M_ICONV_HOOK_TO) == -1)
+ if (mutt_convert_string (out, "utf-8", mod_cset.charset, M_ICONV_HOOK_TO) == -1)
goto notrans;
/*
* domain name.
*/
- if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
+ if (nonreverseok) {
int irrev = 0;
char *t2 = NULL;
char *tmp = m_strdup(*out);
- if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp, mod_cset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
irrev = 1;
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
return -1;
}
- if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp, mod_cset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
rv = -1;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
if (mbox_to_udomain (a->mailbox, &user, &domain) == -1)
continue;
- if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
+ if (mutt_idna_to_local(domain, &tmp, false) == 0) {
p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
}
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 (mutt_idna_to_local (domain, &tmp, true) != 0) {
p_delete(&user);
p_delete(&domain);
p_delete(&tmp);