1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* encoding.c (rb_filesystem_encindex): add fallback to

Browse Source 
ASCII-8BIT on Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-11-06 00:33:56 +00:00
parent e83d7c4eca
commit 0859e7cb87
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Nov 6 09:29:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (rb_filesystem_encindex): add fallback to
ASCII-8BIT on Windows.
Fri Nov 6 07:29:07 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Fri Nov 6 07:29:07 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/ruby/test_case.rb: merged r25658 from ruby_1_8. * test/ruby/test_case.rb: merged r25658 from ruby_1_8.

1
encoding.c
View File

@ -1125,6 +1125,7 @@ rb_filesystem_encindex(void)
char cp[sizeof(int) * 8 / 3 + 4]; char cp[sizeof(int) * 8 / 3 + 4];
snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP()); snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
idx = rb_enc_find_index(cp); idx = rb_enc_find_index(cp);
if (idx < 0) idx = rb_ascii8bit_encindex();
#elif defined __APPLE__ #elif defined __APPLE__
idx = rb_utf8_encindex(); idx = rb_utf8_encindex();
#else #else