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

dir.c: paths as UTF-8

Browse Source 
* dir.c (push_pattern, push_glob): deal with read paths as UTF-8
  to stat later, on Windows as well as OS X.
  [ruby-core:73868] [Bug #12081]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-02-20 04:04:59 +00:00
parent 094cfc445b
commit 4f969f6eee
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Feb 20 13:04:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (push_pattern, push_glob): deal with read paths as UTF-8
to stat later, on Windows as well as OS X.
[ruby-core:73868] [Bug #12081]
Sat Feb 20 01:53:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Feb 20 01:53:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_mod_const_get): make error message at uninterned * object.c (rb_mod_const_get): make error message at uninterned

6
dir.c
View File

@ -2050,7 +2050,7 @@ rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
static void static void
push_pattern(const char *path, VALUE ary, void *enc) push_pattern(const char *path, VALUE ary, void *enc)
{ {
#ifdef __APPLE__ #if defined _WIN32 || defined __APPLE__
VALUE name = rb_utf8_str_new_cstr(path); VALUE name = rb_utf8_str_new_cstr(path);
rb_encoding *eenc = rb_default_internal_encoding(); rb_encoding *eenc = rb_default_internal_encoding();
OBJ_TAINT(name); OBJ_TAINT(name);
@ -2171,7 +2171,7 @@ push_glob(VALUE ary, VALUE str, int flags)
struct push_glob_args args; struct push_glob_args args;
rb_encoding *enc = rb_enc_get(str); rb_encoding *enc = rb_enc_get(str);
#ifdef __APPLE__ #if defined _WIN32 || defined __APPLE__
str = rb_str_encode_ospath(str); str = rb_str_encode_ospath(str);
#endif #endif
if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII) if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
@ -2183,7 +2183,7 @@ push_glob(VALUE ary, VALUE str, int flags)
args.glob.value = ary; args.glob.value = ary;
args.glob.enc = enc; args.glob.enc = enc;
args.flags = flags; args.flags = flags;
#ifdef __APPLE__ #if defined _WIN32 || defined __APPLE__
enc = rb_utf8_encoding(); enc = rb_utf8_encoding();
#endif #endif

9
test/ruby/test_dir_m17n.rb
View File

@ -365,10 +365,17 @@ class TestDir_M17N < Test::Unit::TestCase
def test_glob_encoding def test_glob_encoding
with_tmpdir do with_tmpdir do
%W"file_one.ext file_two.ext".each {|f| open(f, "w") {}} list = %W"file_one.ext file_two.ext \u{6587 4ef6}1.txt \u{6587 4ef6}2.txt"
list.each {|f| open(f, "w") {}}
a = "file_one*".force_encoding Encoding::IBM437 a = "file_one*".force_encoding Encoding::IBM437
b = "file_two*".force_encoding Encoding::EUC_JP b = "file_two*".force_encoding Encoding::EUC_JP
assert_equal([a, b].map(&:encoding), Dir[a, b].map(&:encoding)) assert_equal([a, b].map(&:encoding), Dir[a, b].map(&:encoding))
dir = "\u{76EE 5F551}"
Dir.mkdir(dir)
list << dir
bug12081 = '[ruby-core:73868] [Bug #12081]'
a = "*".force_encoding("us-ascii")
assert_equal(list, Dir[a].map {|n| n.encode(Encoding::UTF_8)}.sort, bug12081)
end end
end end