summaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-01 21:53:14 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-01 21:53:14 +0000
commit85aff134ba14cf0ebc16349b3a746c715d51982b (patch)
treee798d9f2b27985f63a23e020731034e0fbf1c9ac /encoding.c
parente05d009f2de34aa4d5794aad9d7fd36c4108d1e4 (diff)
downloadruby-85aff134ba14cf0ebc16349b3a746c715d51982b.tar.gz
ruby-85aff134ba14cf0ebc16349b3a746c715d51982b.tar.xz
ruby-85aff134ba14cf0ebc16349b3a746c715d51982b.zip
* encoding.c (rb_filesystem_encoding): Windows' filesystem encoding is
sometimes ANSI code page and sometimes OEM code page. we should check whether code page is used. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c
index 337942bf7..4afee36ff 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", GetOEMCP());
+ snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
enc = rb_enc_find(cp);
#elif defined __APPLE__
enc = rb_enc_find("UTF8-MAC");