X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=686e849b0181d60f7abe9aaaab152a885393ab5d;hp=e2919ff9d44b7e65c9e8b9184a08e51dde25db1b;hb=c128336d307ca44d2721c0135bcdef577ff3089e;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/mutt_idna.c b/mutt_idna.c
index e2919ff..686e849 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -7,14 +7,11 @@
  * 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"
@@ -24,7 +21,7 @@
 
 #ifndef HAVE_LIBIDN
 
-int mutt_idna_to_local (const char *in, char **out, int flags)
+int mutt_idna_to_local (const char *in, char **out, int flags __attribute__ ((unused)))
 {
   *out = m_strdup(in);
   return 1;
@@ -51,7 +48,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", MCharset.charset, M_ICONV_HOOK_TO) == -1)
     goto notrans;
 
   /* 
@@ -64,7 +61,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
     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;
@@ -99,7 +96,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, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
     rv = -1;
   if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
     rv = -2;
@@ -132,7 +129,7 @@ static int mbox_to_udomain (const char *mbx, char **user, char **domain)
   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;
@@ -154,7 +151,7 @@ int mutt_addrlist_to_idna (address_t * a, const 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);
@@ -181,7 +178,7 @@ int mutt_addrlist_to_local (address_t * a)
 
     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);
@@ -215,7 +212,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);
@@ -245,7 +242,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;