merge revision(s) 54720: [Backport ruby#12184]

unak · unak · commit ed03c4d8d53a · 2016-04-26T04:21:14.000Z
* ruby.c: cygwin does not use w32_cmdvector, command line can be other than UTF-8. [ruby-dev:49519] [Bug ruby#12184] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 26 13:18:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c: cygwin does not use w32_cmdvector, command line can be
+	  other than UTF-8.  [ruby-dev:49519] [Bug #12184]
+
 Tue Apr 26 13:16:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval_jump.c (exec_end_procs_chain): restore previous error info
diff --git a/ruby.c b/ruby.c
@@ -338,7 +338,9 @@ translit_char_bin(char *p, int from, int to)
 	p++;
     }
 }
+#endif
 
+#ifdef _WIN32
 # define UTF8_PATH 1
 #endif
 
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
@@ -698,7 +698,8 @@ def test_unmatching_glob
     end
   end
 
-  if /mswin|mingw/ =~ RUBY_PLATFORM
+  case RUBY_PLATFORM
+  when /mswin|mingw/
     def test_command_line_glob_nonascii
       bug10555 = '[ruby-dev:48752] [Bug #10555]'
       name = "\u{3042}.txt"
@@ -728,9 +729,7 @@ def test_command_line_glob_with_dir
         assert_in_out_err(["-e", "", "test/*"], "", [], [], bug10941)
       end
     end
-  end
 
-  if /mswin|mingw/ =~ RUBY_PLATFORM
     Ougai = %W[\u{68ee}O\u{5916}.txt \u{68ee 9d0e 5916}.txt \u{68ee 9dd7 5916}.txt]
     def test_command_line_glob_noncodepage
       with_tmpchdir do |dir|
@@ -740,6 +739,14 @@ def test_command_line_glob_noncodepage
         assert_in_out_err(["-e", "puts ARGV", "*.txt"], "", ougai)
       end
     end
+  when /cygwin/
+    def test_command_line_non_ascii
+      assert_separately([{"LC_ALL"=>"ja_JP.SJIS"}, "-", "\u{3042}".encode("SJIS")], <<-"end;")
+        bug12184 = '[ruby-dev:49519] [Bug #12184]'
+        a = ARGV[0]
+        assert_equal([Encoding::SJIS, 130, 160], [a.encoding, *a.bytes], bug12184)
+      end;
+    end
   end
 
   def test_script_is_directory
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 315
+#define RUBY_PATCHLEVEL 316
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,9 @@ translit_char_bin(char *p, int from, int to)`
`338`	`338`	`p++;`
`339`	`339`	`}`
`340`	`340`	`}`
	`341`	`+#endif`
`341`	`342`
	`343`	`+#ifdef _WIN32`
`342`	`344`	`# define UTF8_PATH 1`
`343`	`345`	`#endif`
`344`	`346`