From: NARUSE, Yui <naruse@users.sourceforge.jp>
Date: Fri, 4 Mar 2005 07:03:17 +0000 (+0000)
Subject: * set_input_codename from iconv when input_codename isn't set
X-Git-Tag: v2_0_6_beta2~50
X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=c879f635b76d87f0a710717949ace324080ff1ff;ds=inline

* set_input_codename from iconv when input_codename isn't set
---

diff --git a/nkf.c b/nkf.c
index 09f0eb6..852a3ab 100644
--- a/nkf.c
+++ b/nkf.c
@@ -39,9 +39,9 @@
 **        E-Mail: furukawa@tcp-ip.or.jp
 **    まで御連絡をお願いします。
 ***********************************************************************/
-/* $Id: nkf.c,v 1.62 2005/02/27 01:22:02 rei_furukawa Exp $ */
+/* $Id: nkf.c,v 1.63 2005/03/03 22:03:17 naruse Exp $ */
 #define NKF_VERSION "2.0.4"
-#define NKF_RELEASE_DATE "2005-02-20"
+#define NKF_RELEASE_DATE "2005-03-04"
 #include "config.h"
 
 static char *CopyRight =
@@ -2197,6 +2197,13 @@ kanji_convert(f)
 
     /* epilogue */
     (*iconv)(EOF, 0, 0);
+    if (!is_inputcode_set)
+	set_input_codename(
+	    iconv == e_iconv ? "EUC-JP" :
+	    iconv == s_iconv ? "Shift_JIS" :
+	    iconv == w_iconv ? "UTF-8" :
+	    iconv == w_iconv16 ? "UTF-16" :
+	    "ASCII");
     return 1;
 }