From 8e5b796c51d06ff6f1bdf6ca3e231a0026a608b0 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 5 Jan 2009 08:44:10 +0000 Subject: * encoding.c (rb_locale_charmap): use GetConsoleCP() instead of GetACP() because external encoding should be console's one. * encoding.c (rb_filesystem_encoding): use GetOEMCP() instead of GetACP() because VFAT/FAT32 uses OEM CP. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index fde710360..f0411d16e 100644 --- a/encoding.c +++ b/encoding.c @@ -1034,7 +1034,7 @@ rb_filesystem_encoding(void) enc = rb_default_external_encoding(); #elif defined _WIN32 || defined __CYGWIN__ char cp[sizeof(int) * 8 / 3 + 4]; - snprintf(cp, sizeof cp, "CP%d", GetACP()); + snprintf(cp, sizeof cp, "CP%d", GetOEMCP()); enc = rb_enc_find(cp); #elif defined __APPLE__ enc = rb_enc_find("UTF8-MAC"); @@ -1218,7 +1218,7 @@ rb_locale_charmap(VALUE klass) codeset = nl_langinfo(CODESET); return rb_usascii_str_new2(codeset); #elif defined _WIN32 - return rb_sprintf("CP%d", GetACP()); + return rb_sprintf("CP%d", GetConsoleCP()); #else return Qnil; #endif -- cgit