mutt_enter_string is only used for _mutt_get_field for real.

[apps/madmutt.git] / mutt_idna.c

diff --git a/mutt_idna.c b/mutt_idna.c
index 14d8f45..918aa26 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -7,41 +7,21 @@
  * 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/macros.h>
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
 
 #include "mutt.h"
-#include "ascii.h"
 #include "charset.h"
 #include "mutt_idna.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)
-{
-  *out = str_dup (in);
-  return 1;
-}
-
-int mutt_local_to_idna (const char *in, char **out)
-{
-  *out = str_dup (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))
@@ -53,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;
 
   /* 
@@ -61,17 +41,16 @@ 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 = str_dup (*out);
+    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;
     if (!irrev && ascii_strcasecmp (t2, in)) {
-      debug_print (1, ("not reversible. in = '%s', t2 = '%s'.\n", in, t2));
       irrev = 1;
     }
 
@@ -86,14 +65,16 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
 
 notrans:
   p_delete(out);
-  *out = str_dup (in);
+#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 = str_dup (in);
+  char *tmp = m_strdup(in);
 
   *out = NULL;
 
@@ -102,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;
@@ -110,13 +91,14 @@ int mutt_local_to_idna (const char *in, char **out)
   p_delete(&tmp);
   if (rv < 0) {
     p_delete(out);
-    *out = str_dup (in);
+    *out = m_strdup(in);
   }
   return rv;
-}
-
+#else
+  *out = m_strdup(in);
+  return 0;
 #endif
-
+}
 
 /* higher level functions */
 
@@ -131,11 +113,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);
-  *domain = str_dup (p + 1);
+  *domain = m_strdup(p + 1);
   return 0;
 }
 
-int mutt_addrlist_to_idna (ADDRESS * a, char **err)
+int mutt_addrlist_to_idna (address_t * a, char **err)
 {
   char *user = NULL, *domain = NULL;
   char *tmp = NULL;
@@ -153,11 +135,11 @@ int mutt_addrlist_to_idna (ADDRESS * a, char **err)
     if (mutt_local_to_idna (domain, &tmp) < 0) {
       e = 1;
       if (err)
-        *err = str_dup (domain);
+        *err = m_strdup(domain);
     }
     else {
-      p_realloc(&a->mailbox, str_len(user) + str_len(tmp) + 2);
-      sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
+      p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
+      sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
     }
 
     p_delete(&domain);
@@ -171,7 +153,7 @@ int mutt_addrlist_to_idna (ADDRESS * a, char **err)
   return 0;
 }
 
-int mutt_addrlist_to_local (ADDRESS * a)
+int mutt_addrlist_to_local (address_t * a)
 {
   char *user, *domain;
   char *tmp = NULL;
@@ -182,9 +164,9 @@ int mutt_addrlist_to_local (ADDRESS * a)
     if (mbox_to_udomain (a->mailbox, &user, &domain) == -1)
       continue;
 
-    if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
-      p_realloc(&a->mailbox, str_len(user) + str_len(tmp) + 2);
-      sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
+    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));
     }
 
     p_delete(&domain);
@@ -196,7 +178,7 @@ int mutt_addrlist_to_local (ADDRESS * a)
 }
 
 /* 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;
@@ -210,15 +192,15 @@ const char *mutt_addr_for_display (ADDRESS * 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);
     return a->mailbox;
   }
 
-  p_realloc(&buff, str_len(tmp) + str_len(user) + 2);
-  sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+  p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
+  sprintf(buff, "%s@%s", NONULL (user), NONULL (tmp));
   p_delete(&tmp);
   p_delete(&user);
   p_delete(&domain);
@@ -248,7 +230,7 @@ void mutt_env_to_local (ENVELOPE * e)
      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;