Changeset 2295:46bd9f595995 for charset.c

Timestamp:

2001-02-14 15:35:28 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

iconv-hook.

Files:

• charset.c (modified) (3 diffs)

charset.c

@@ -196 +196 @@
   { "ko_KR-euc",        "euc-kr"        },
   { "zh_TW-big5",       "big5"          },
-  
-  
-  
-  
+
+  /* seems to be common on some systems */
+
+  { "sjis",             "Shift_JIS"     },
+
   
   /* End of aliases.  Please keep this line last. */
@@ -307 +308 @@
   char *tmp;
 
+  iconv_t cd;
+  
   mutt_canonical_charset (tocode1, sizeof (tocode1), tocode);
   if ((flags & M_ICONV_HOOK_TO) && (tmp = mutt_charset_hook (tocode1)))
@@ -315 +318 @@
     mutt_canonical_charset (fromcode1, sizeof (fromcode1), tmp);
 
-  return iconv_open (tocode1, fromcode1);
+  if ((cd = iconv_open (tocode1, fromcode1)) != (iconv_t) -1)
+    return cd;
+  /* else */
+  return iconv_open (mutt_iconv_hook (tocode1), mutt_iconv_hook (fromcode1));
 }