diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 17:35:52 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 17:35:52 +0000 |
commit | bf2d4e93b1f053d3fea18890728b2e12cd7fc34b (patch) | |
tree | 44ead47ab802fd12f5026102a44a8d25c24a8233 | |
parent | ae432a96b1d064e39b23aeccea9ca5cfafd71ee0 (diff) |
merge revision(s) 54785: [Backport #11900]
* ruby.c (process_options): convert -e script to the encoding
given by a command line option on Windows. assume it is the
expected encoding. [ruby-dev:49461] [Bug #11900]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ruby.c | 21 | ||||
-rw-r--r-- | test/ruby/test_rubyoptions.rb | 28 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 54 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sun Mar 26 02:35:17 2017 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.c (process_options): convert -e script to the encoding + given by a command line option on Windows. assume it is the + expected encoding. [ruby-dev:49461] [Bug #11900] + Sun Mar 26 02:32:12 2017 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets @@ -1285,6 +1285,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt) VALUE parser; VALUE iseq; rb_encoding *enc, *lenc; +#if UTF8_PATH + rb_encoding *uenc, *ienc = 0; +#endif const char *s; char fbuf[MAXPATHLEN]; int i = (int)proc_options(argc, argv, opt, 0); @@ -1395,6 +1398,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt) enc = rb_enc_from_index(opt->intern.enc.index); rb_enc_set_default_internal(rb_enc_from_encoding(enc)); opt->intern.enc.index = -1; +#if UTF8_PATH + ienc = enc; +#endif } rb_enc_associate(opt->script_name, lenc); rb_obj_freeze(opt->script_name); @@ -1413,8 +1419,11 @@ process_options(int argc, char **argv, struct cmdline_options *opt) } ruby_init_prelude(); #if UTF8_PATH - opt->script_name = str_conv_enc(opt->script_name, rb_utf8_encoding(), lenc); - opt->script = RSTRING_PTR(opt->script_name); + uenc = rb_utf8_encoding(); + if (uenc != lenc) { + opt->script_name = str_conv_enc(opt->script_name, uenc, lenc); + opt->script = RSTRING_PTR(opt->script_name); + } #endif ruby_set_argv(argc, argv); process_sflag(&opt->sflag); @@ -1438,7 +1447,15 @@ process_options(int argc, char **argv, struct cmdline_options *opt) } else { eenc = lenc; +#if UTF8_PATH + if (ienc) eenc = ienc; +#endif } +#if UTF8_PATH + if (eenc != uenc) { + opt->e_script = str_conv_enc(opt->e_script, uenc, eenc); + } +#endif rb_enc_associate(opt->e_script, eenc); if (!(opt->dump & ~DUMP_BIT(version_v))) { ruby_set_script_name(opt->script_name); diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index d3ac0bc0cf..d61569b03f 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -739,6 +739,34 @@ class TestRubyOptions < Test::Unit::TestCase assert_in_out_err(["-e", "puts ARGV", "*.txt"], "", ougai) end end + + def assert_e_script_encoding(str, args = []) + cmds = [ + EnvUtil::LANG_ENVS.inject({}) {|h, k| h[k] = ENV[k]; h}, + *args, + '-e', "s = '#{str}'", + '-e', 'puts s.encoding.name', + '-e', 'puts s.dump', + ] + assert_in_out_err(cmds, "", [str.encoding.name, str.dump], [], + "#{str.encoding}:#{str.dump} #{args.inspect}") + end + + # tested codepages: 437 850 852 855 932 65001 + # Since the codepage is shared all processes per conhost.exe, do + # not chcp, or parallel test may break. + def test_locale_codepage + locale = Encoding.find("locale") + list = %W"\u{c7} \u{452} \u{3066 3059 3068}" + list.each do |s| + assert_e_script_encoding(s, %w[-U]) + end + list.each do |s| + s = s.encode(locale) rescue next + assert_e_script_encoding(s) + assert_e_script_encoding(s, %W[-E#{locale.name}]) + end + end when /cygwin/ def test_command_line_non_ascii assert_separately([{"LC_ALL"=>"ja_JP.SJIS"}, "-", "\u{3042}".encode("SJIS")], <<-"end;") @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2017-03-26" -#define RUBY_PATCHLEVEL 443 +#define RUBY_PATCHLEVEL 444 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |