diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | dir.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_dir_m17n.rb | 9 |
3 files changed, 17 insertions, 4 deletions
@@ -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> * object.c (rb_mod_const_get): make error message at uninterned @@ -2050,7 +2050,7 @@ rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg) static void push_pattern(const char *path, VALUE ary, void *enc) { -#ifdef __APPLE__ +#if defined _WIN32 || defined __APPLE__ VALUE name = rb_utf8_str_new_cstr(path); rb_encoding *eenc = rb_default_internal_encoding(); OBJ_TAINT(name); @@ -2171,7 +2171,7 @@ push_glob(VALUE ary, VALUE str, int flags) struct push_glob_args args; rb_encoding *enc = rb_enc_get(str); -#ifdef __APPLE__ +#if defined _WIN32 || defined __APPLE__ str = rb_str_encode_ospath(str); #endif 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.enc = enc; args.flags = flags; -#ifdef __APPLE__ +#if defined _WIN32 || defined __APPLE__ enc = rb_utf8_encoding(); #endif diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index febfbc0511..c6be8b6109 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -365,10 +365,17 @@ class TestDir_M17N < Test::Unit::TestCase def test_glob_encoding 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 b = "file_two*".force_encoding Encoding::EUC_JP 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 |