summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-17 00:41:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-17 00:41:56 +0000
commitfef3c0a4156b33371e39e05e9616076658d24ad7 (patch)
tree4854de0ccaff872588f96a7bce482e33eed67f2c /lib
parent2f3998851148a1b95f9f4e5b6ccf48a9400c33cc (diff)
* lib/fileutils.rb (FileUtils::Entry_#entries): returns pathname in
UTF-8 on Windows to allow FileUtils accessing all pathnames internally. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/fileutils.rb4
1 files changed, 3 insertions, 1 deletions
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