apply #39273

diff --git a/ChangeLog.j b/ChangeLog.j
index 2d87dd0..91b2ee7 100644 (file)
--- a/ChangeLog.j
+++ b/ChangeLog.j
@@ -1,6 +1,7 @@
        * \8e\9f\82Ì\96â\91è\82ð\8fC\90³
          * \8e\80\91Ì\82É\91h\90¶\82Ì\8fñ\82ð\90U\82é\82Æ\83N\83\89\83b\83V\83\85\82·\82é (#39081)
          * \89\8a\82Å\83X\83\89\83C\83\80\89»\82Ì\89ð\8f\9c\82ª\82Å\82«\82È\82¢ (#39134)
+       * unix\82Å\82Ì\83f\83t\83H\83\8b\83g\95¶\8e\9a\83R\81[\83h\82ðUTF-8\82É\95Ï\8dX(#39273)
 
 Sun Dec 26 2018  Kentaro Shirakata  <argrath@ub32.org>
 

diff --git a/japanese/jlib.c b/japanese/jlib.c
index a400bb6..01de74f 100644 (file)
--- a/japanese/jlib.c
+++ b/japanese/jlib.c
@@ -38,19 +38,19 @@ static const char* ccode_alt[]={
 
 /* default input kcode */
 #ifndef INPUT_KCODE
-# ifdef MSDOS
+# if defined(MSDOS) || defined(WIN32)
 #  define INPUT_KCODE SJIS
 # else
-#  define INPUT_KCODE EUC
+#  define INPUT_KCODE UTF8
 # endif
 #endif
 
 /* default output kcode */
 #ifndef OUTPUT_KCODE
-# ifdef MSDOS
+# if defined(MSDOS) || defined(WIN32)
 #  define OUTPUT_KCODE SJIS
 # else
-#  define OUTPUT_KCODE EUC
+#  define OUTPUT_KCODE UTF8
 # endif
 #endif
 

diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c
index 5f737fe..4762eb8 100644 (file)
--- a/sys/unix/unixmain.c
+++ b/sys/unix/unixmain.c
@@ -64,6 +64,10 @@ char *argv[];
 
     sys_early_init();
 
+#if 1 /*JP*//* iconv\82Ì\8f\89\8aú\89»\82Ì\82½\82ß\82É\88ê\93x\82Í\8cÄ\82Ñ\8fo\82·\95K\97v\82ª\82 \82é */
+    setkcode('U');
+#endif
+
 #ifdef XI18N
     setlocale(LC_ALL, "");
 #endif