mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/win32.c (rb_w32_readdir_with_enc): fallback to OS convertion
when ASCII-8BIT is passed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6343c99a2e
commit
7e1050e604
2 changed files with 9 additions and 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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
//
|
||||
|
|
Loading…
Reference in a new issue