X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.cpkg;h=89905b8ed4b11b6b1abbb8576815c06a6f2cf171;hp=f491e05f9aacdcd92a0337f1b42c43c700b99aa7;hb=db3bd72d8b48f1f9b49899da081ffbec4ce2c1c6;hpb=5f0d69cc13a116be64a243c07bad259af7d90397

diff --git a/charset.cpkg b/charset.cpkg
index f491e05..89905b8 100644
--- a/charset.cpkg
+++ b/charset.cpkg
@@ -27,7 +27,7 @@
 
 #include <lib-lib/lib-lib.h>
 
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LANGINFO_H
 #  include <langinfo.h>
 #endif
 
@@ -47,7 +47,7 @@ static rx_t *iconv_hooks   = NULL;
 static char *charset_init(void)
 {
     const char *res = "iso-8859-1";
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LANGINFO_H
     char buff[STRING];
     char buff2[STRING];
 
@@ -59,9 +59,7 @@ static char *charset_init(void)
         res = buff2;
     }
 #endif
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
     bind_textdomain_codeset(PACKAGE, res);
-#endif
     return m_strdup(res);
 }
 
@@ -71,7 +69,7 @@ static void charset_onchange(const char *cset)
     CharsetReplacement = Charset_is_utf8 ? 0xfffd : '?';
 }
 
-@package MCharset {
+@package mod_cset {
     /*
      ** .pp
      ** This variable is a colon-separated list of character encoding
@@ -128,13 +126,13 @@ static void charset_onchange(const char *cset)
 
     void charset_hook(rx_t local, const string_t alias) {
         rx_set_template(local, alias);
-        rx_list_append(&charset_hooks, local);
+        rx_list_add2(&charset_hooks, &local);
         RETURN();
     };
 
     void iconv_hook(rx_t local, const string_t alias) {
         rx_set_template(local, alias);
-        rx_list_append(&iconv_hooks, local);
+        rx_list_add2(&iconv_hooks, &local);
         RETURN();
     };
 };
@@ -209,8 +207,8 @@ int charset_is_us_ascii(const char *s)
 /* Like iconv_open, but canonicalises the charsets */
 iconv_t mutt_iconv_open(const char *tocode, const char *fromcode, int flags)
 {
-    char to1[STRING];
-    char from1[STRING];
+    char to1[STRING],   to2[STRING];
+    char from1[STRING], from2[STRING];
     char tmp[STRING];
     iconv_t cd;
 
@@ -231,14 +229,10 @@ iconv_t mutt_iconv_open(const char *tocode, const char *fromcode, int flags)
     if ((cd = iconv_open(to1, from1)) != MUTT_ICONV_ERROR)
         return cd;
 
-    {
-        char to2[STRING];
-        char from2[STRING];
+    if (rx_list_match2(iconv_hooks, to1, to2, sizeof(to2))
+    &&  rx_list_match2(iconv_hooks, from1, from2, sizeof(from2)))
+        return iconv_open(to2, from2);
 
-        if (rx_list_match2(iconv_hooks, to1, to2, sizeof(to2))
-        &&  rx_list_match2(iconv_hooks, from1, from2, sizeof(from2)))
-            return iconv_open(to2, from2);
-    }
     return MUTT_ICONV_ERROR;
 }
 
@@ -389,7 +383,7 @@ static ssize_t convert_string(const char *f, ssize_t flen,
 
 int mutt_convert_nonmime_string(char **ps)
 {
-    const char *p = MCharset.assumed_charset;
+    const char *p = mod_cset.assumed_charset;
     ssize_t ulen = m_strlen(*ps);
     char *u = *ps;
 
@@ -408,7 +402,7 @@ int mutt_convert_nonmime_string(char **ps)
         m_strncpy(fromcode, sizeof(fromcode), p, q - p);
         p = q;
 
-        if (convert_string(u, ulen, fromcode, MCharset.charset, &s, &slen) >= 0) {
+        if (convert_string(u, ulen, fromcode, mod_cset.charset, &s, &slen) >= 0) {
             p_delete(ps);
             *ps = s;
             return 0;