From 2009b8cabf04e0ea02fb49071f79218ecd47bfd6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 31 Mar 2017 00:35:02 +0000
Subject: RUBY_DEBUG codepage option [ci skip]

* debug.c (set_debug_option): add "codepage" option to force
  locale charmap on Windows.

* localeinit.c (locale_charmap): use the codepage by debug env if
  given.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 debug.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'debug.c')

diff --git a/debug.c b/debug.c
index 8a5e69bbf5..e785af98f4 100644
--- a/debug.c
+++ b/debug.c
@@ -106,12 +106,16 @@ ruby_debug_breakpoint(void)
     /* */
 }
 
+#if defined _WIN32
+# if RUBY_MSVCRT_VERSION >= 80
+extern int ruby_w32_rtc_error;
+# endif
+UINT ruby_w32_codepage;
+#endif
+
 static void
 set_debug_option(const char *str, int len, void *arg)
 {
-#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
-    extern int ruby_w32_rtc_error;
-#endif
 #define SET_WHEN(name, var, val) do {	    \
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
@@ -119,10 +123,25 @@ set_debug_option(const char *str, int len, void *arg)
 	    return;			    \
 	}				    \
     } while (0)
+#define NAME_MATCH_VALUE(name) \
+    ((size_t)len > sizeof(name) && \
+     strncmp(str, (name), sizeof(name)-1) == 0 && \
+     str[sizeof(name)-1] == '=' && \
+     (str += sizeof(name), len -= sizeof(name), 1))
+
     SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue);
     SET_WHEN("core", ruby_enable_coredump, 1);
-#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
+#if defined _WIN32
+# if RUBY_MSVCRT_VERSION >= 80
     SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
+# endif
+    if (NAME_MATCH_VALUE("codepage")) {
+	int ov;
+	size_t retlen;
+	ruby_w32_codepage =
+	    ruby_scan_digits(str, len, 10, &retlen, &ov);
+	return;
+    }
 #endif
     fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
 }
-- 
cgit v1.2.3