1 files changed, 39 insertions, 15 deletions

diff --git a/localeinit.c b/localeinit.c
index eeec9adac6..cea2e309f5 100644
--- a/localeinit.c
+++ b/localeinit.c
@@ -9,6 +9,7 @@
 
 **********************************************************************/
 
+#include "ruby/encoding.h"
 #include "internal.h"
 #include "encindex.h"
 #ifdef __CYGWIN__
@@ -21,35 +22,45 @@
 #if defined _WIN32 || defined __CYGWIN__
 #define SIZEOF_CP_NAME ((sizeof(UINT) * 8 / 3) + 4)
 #define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage))
+
+extern UINT ruby_w32_codepage[2];
+#endif
+
+#ifndef NO_LOCALE_CHARMAP
+# if defined _WIN32 || defined __CYGWIN__ || defined HAVE_LANGINFO_H
+#   define NO_LOCALE_CHARMAP 0
+# else
+#   define NO_LOCALE_CHARMAP 1
+# endif
 #endif
 
+#if !NO_LOCALE_CHARMAP
 static VALUE
 locale_charmap(VALUE (*conv)(const char *))
 {
-#if defined NO_LOCALE_CHARMAP
-# error NO_LOCALE_CHARMAP defined
-#elif defined _WIN32 || defined __CYGWIN__
     const char *codeset = 0;
+#if defined _WIN32 || defined __CYGWIN__
     char cp[SIZEOF_CP_NAME];
 # ifdef __CYGWIN__
     const char *nl_langinfo_codeset(void);
     codeset = nl_langinfo_codeset();
 # endif
     if (!codeset) {
-	UINT codepage = GetConsoleCP();
-	if (!codepage) codepage = GetACP();
-	CP_FORMAT(cp, codepage);
-	codeset = cp;
+        UINT codepage = ruby_w32_codepage[0];
+        if (!codepage) codepage = GetConsoleCP();
+        if (!codepage) codepage = GetACP();
+        CP_FORMAT(cp, codepage);
+        codeset = cp;
     }
-    return (*conv)(codeset);
 #elif defined HAVE_LANGINFO_H
-    char *codeset;
     codeset = nl_langinfo(CODESET);
-    return (*conv)(codeset);
+    ASSUME(codeset);
 #else
-    return ENCINDEX_US_ASCII;
+# error locale_charmap() is not implemented
 #endif
+    return (*conv)(codeset);
 }
+#endif
 
 /*
  * call-seq:
@@ -79,32 +90,45 @@ locale_charmap(VALUE (*conv)(const char *))
 VALUE
 rb_locale_charmap(VALUE klass)
 {
+#if NO_LOCALE_CHARMAP
+    return rb_usascii_str_new_cstr("US-ASCII");
+#else
     return locale_charmap(rb_usascii_str_new_cstr);
+#endif
 }
 
+#if !NO_LOCALE_CHARMAP
 static VALUE
 enc_find_index(const char *name)
 {
     return (VALUE)rb_enc_find_index(name);
 }
+#endif
 
 int
 rb_locale_charmap_index(void)
 {
+#if NO_LOCALE_CHARMAP
+    return ENCINDEX_US_ASCII;
+#else
     return (int)locale_charmap(enc_find_index);
+#endif
 }
 
 int
 Init_enc_set_filesystem_encoding(void)
 {
     int idx;
-#if defined NO_LOCALE_CHARMAP
-# error NO_LOCALE_CHARMAP defined
+#if NO_LOCALE_CHARMAP
+    idx = ENCINDEX_US_ASCII;
 #elif defined _WIN32
     char cp[SIZEOF_CP_NAME];
-    CP_FORMAT(cp, AreFileApisANSI() ? GetACP() : GetOEMCP());
+    const UINT codepage = ruby_w32_codepage[1];
+    if (!codepage) return ENCINDEX_UTF_8;
+    /* for debugging */
+    CP_FORMAT(cp, codepage);
     idx = rb_enc_find_index(cp);
-    if (idx < 0) idx = ENCINDEX_ASCII;
+    if (idx < 0) idx = ENCINDEX_ASCII_8BIT;
 #elif defined __CYGWIN__
     idx = ENCINDEX_UTF_8;
 #else