summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-31 00:35:02 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-31 00:35:02 (GMT)
commit5c9cd965bec9393e2c5e6594763a8a3efd0ad771 (patch)
tree2c37a87d21e7022de7a4d5bb99417400b5b1f5a6
parent4c70f04786605ebd80dc9de9328f1d4a22b6f2db (diff)
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
-rw-r--r--debug.c27
-rw-r--r--localeinit.c13
2 files changed, 34 insertions, 6 deletions
diff --git a/debug.c b/debug.c
index 8a5e69b..e785af9 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);
}
diff --git a/localeinit.c b/localeinit.c
index 394d8dc..fa9cc26 100644
--- a/localeinit.c
+++ b/localeinit.c
@@ -23,6 +23,12 @@
#define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage))
#endif
+#if defined _WIN32 && defined RUBY_DEBUG_ENV
+extern UINT ruby_w32_codepage;
+#else
+enum {ruby_w32_codepage = 0};
+#endif
+
#ifndef NO_LOCALE_CHARMAP
# if defined _WIN32 || defined __CYGWIN__ || defined HAVE_LANGINFO_H
# define NO_LOCALE_CHARMAP 0
@@ -43,7 +49,8 @@ locale_charmap(VALUE (*conv)(const char *))
codeset = nl_langinfo_codeset();
# endif
if (!codeset) {
- UINT codepage = GetConsoleCP();
+ UINT codepage = ruby_w32_codepage;
+ if (!codepage) codepage = GetConsoleCP();
if (!codepage) codepage = GetACP();
CP_FORMAT(cp, codepage);
codeset = cp;
@@ -119,7 +126,9 @@ Init_enc_set_filesystem_encoding(void)
idx = ENCINDEX_US_ASCII;
#elif defined _WIN32
char cp[SIZEOF_CP_NAME];
- CP_FORMAT(cp, AreFileApisANSI() ? GetACP() : GetOEMCP());
+ const UINT codepage = ruby_w32_codepage ? ruby_w32_codepage :
+ AreFileApisANSI() ? GetACP() : GetOEMCP();
+ CP_FORMAT(cp, codepage);
idx = rb_enc_find_index(cp);
if (idx < 0) idx = ENCINDEX_ASCII;
#elif defined __CYGWIN__