diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-01 21:53:14 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-01 21:53:14 +0000 |
| commit | 85aff134ba14cf0ebc16349b3a746c715d51982b (patch) | |
| tree | e798d9f2b27985f63a23e020731034e0fbf1c9ac | |
| parent | e05d009f2de34aa4d5794aad9d7fd36c4108d1e4 (diff) | |
| download | ruby-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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | encoding.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Feb 2 06:51:36 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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. + Sun Feb 1 21:27:55 2009 Tanaka Akira <akr@fsij.org> * ext/socket/raddrinfo.c (addrinfo_ipv4_private_p): new method. 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"); |