From: Rei FURUKAWA <rei_furukawa@users.sourceforge.jp>
Date: Thu, 7 Oct 2004 03:56:01 +0000 (+0000)
Subject: bug fix
X-Git-Tag: v2_0_6_beta2~96
X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=b9207cea87351658d05b6b7265c01a0b3ee20c20

bug fix
---

diff --git a/nkf.c b/nkf.c
index 76c0dcc..9a620f1 100644
--- a/nkf.c
+++ b/nkf.c
@@ -1221,7 +1221,9 @@ options(cp)
             }
             continue;
         case 'g':
+#ifndef PERL_XS
             guess_f = TRUE;
+#endif
             continue;
         case ' ':    
         /* module muliple options in a string are allowed for Perl moudle  */
@@ -2368,7 +2370,7 @@ w_iconv16(c2, c1, c0)
 	utf16_mode = UTF16BE_INPUT;
 	return 0;    
     }
-    if (utf16_mode == UTF16BE_INPUT) {
+    if (c2 != EOF && utf16_mode == UTF16BE_INPUT) {
 	int tmp;
 	tmp=c1; c1=c2; c2=tmp;
     }