Fix madmutt for stupid terms with only 64 colors.

[apps/madmutt.git] / mutt_idna.c

diff --git a/mutt_idna.c b/mutt_idna.c
index c728e5e..918aa26 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -19,24 +19,9 @@
 
 /* The low-level interface we use. */
 
-#ifndef HAVE_LIBIDN
-
-int mutt_idna_to_local (const char *in, char **out, int flags __attribute__ ((unused)))
-{
-  *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, bool nonreverseok)
 {
+#ifdef HAVE_LIBIDN
   *out = NULL;
 
   if (!option (OPTUSEIDN))
@@ -48,7 +33,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
   /* 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", mod_cset.charset, M_ICONV_HOOK_TO) == -1)
     goto notrans;
 
   /* 
@@ -56,12 +41,12 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
    * 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, 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;
@@ -80,12 +65,14 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
 
 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);
 
@@ -96,7 +83,7 @@ int mutt_local_to_idna (const char *in, char **out)
     return -1;
   }
 
-  if (mutt_convert_string (&tmp, 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;
@@ -107,10 +94,11 @@ int mutt_local_to_idna (const char *in, char **out)
     *out = m_strdup(in);
   }
   return rv;
-}
-
+#else
+  *out = m_strdup(in);
+  return 0;
 #endif
-
+}
 
 /* higher level functions */
 
@@ -151,7 +139,7 @@ int mutt_addrlist_to_idna (address_t * a, char **err)
     }
     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);
@@ -176,9 +164,9 @@ int mutt_addrlist_to_local (address_t * a)
     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));       /* __SPRINTF_CHECKED__ */
+      sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
     }
 
     p_delete(&domain);
@@ -204,7 +192,7 @@ const char *mutt_addr_for_display (address_t * a)
 
   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);
@@ -212,7 +200,7 @@ const char *mutt_addr_for_display (address_t * a)
   }
 
   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);