diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/fileutils.rb | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon May 17 09:37:25 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/fileutils.rb (FileUtils::Entry_#entries): returns pathname in + UTF-8 on Windows to allow FileUtils accessing all pathnames + internally. + Mon May 17 01:07:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * dln.c (rb_w32_check_imported): workaround for VC6. diff --git a/lib/fileutils.rb b/lib/fileutils.rb index c65f007b8a..f2afdfbcf7 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1176,7 +1176,9 @@ module FileUtils end def entries - Dir.entries(path())\ + opts = {} + opts[:encoding] = "UTF-8" if /mswin|mignw/ =~ RUBY_PLATFORM + Dir.entries(path(), opts)\ .reject {|n| n == '.' or n == '..' }\ .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) } end |