diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 14:48:39 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 14:48:39 +0000 |
commit | dd4399e231c3b73008a69adb6eca8803de8a7d78 (patch) | |
tree | 0540233874d1de5f21e618277a740655734ec41d | |
parent | e34df45eba73ebd58523d5f970f94d1cd3e0d43a (diff) |
merge revision(s) 53877,53881: [Backport #12081]
* 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/branches/ruby_2_3@54407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dir.c | 6 | ||||
-rw-r--r-- | test/ruby/test_dir_m17n.rb | 16 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 25 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Mar 29 23:45:24 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] + Tue Mar 29 23:36:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/extmk.rb: add cygwin case, nothing excluded. @@ -2027,7 +2027,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); @@ -2148,7 +2148,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) @@ -2160,7 +2160,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..4efc8ca34d 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -365,10 +365,24 @@ 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") + result = Dir[a].map {|n| + if n.encoding == Encoding::ASCII_8BIT + n.force_encoding(Encoding::UTF_8) + else + n.encode(Encoding::UTF_8) + end + } + assert_equal(list, result.sort!, bug12081) end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 55 +#define RUBY_PATCHLEVEL 56 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |