diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-06 09:18:46 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-06 09:18:46 +0000 |
| commit | 0c7a625c8ad53da5abdaee727be3f314367c3cfa (patch) | |
| tree | 62ef348756180b69d457057426e633adcd4484b9 | |
| parent | 62a04cb007bd6d96cd2365eb3efe59150b746c32 (diff) | |
| download | ruby-0c7a625c8ad53da5abdaee727be3f314367c3cfa.tar.gz ruby-0c7a625c8ad53da5abdaee727be3f314367c3cfa.tar.xz ruby-0c7a625c8ad53da5abdaee727be3f314367c3cfa.zip | |
* win32/win32.c (rb_w32_readdir_with_enc): fallback to OS convertion
when ASCII-8BIT is passed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Feb 6 18:18:07 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_readdir_with_enc): fallback to OS convertion + when ASCII-8BIT is passed. + Fri Feb 6 17:19:23 2009 NAKAMURA Usaku <usa@ruby-lang.org> * win32/{dir.h, win32.c} (rb_w32_readdir_with_enc): new function to diff --git a/win32/win32.c b/win32/win32.c index c5bcf534c..4c92ef19b 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1674,7 +1674,10 @@ rb_w32_readdir(DIR *dirp) struct direct * rb_w32_readdir_with_enc(DIR *dirp, rb_encoding *enc) { - return readdir_internal(dirp, ruby_direct_conv, enc); + if (enc == rb_ascii8bit_encoding()) + return readdir_internal(dirp, win32_direct_conv, NULL); + else + return readdir_internal(dirp, ruby_direct_conv, enc); } // |