kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ruby.c (proc_options): no warning when default_external already

Browse source 
set by -E.

* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_rubyopt):
  put -K after -E to set script encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-10-16 22:21:09 +00:00
parent c2b9d34f62
commit 4709e330cf
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -51,6 +51,14 @@ Thu Oct 16 14:30:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* instruby.rb (lib): installs all files other than README etc. * instruby.rb (lib): installs all files other than README etc.
Thu Oct 16 08:14:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (proc_options): no warning when default_external already
set by -E.
* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_rubyopt):
put -K after -E to set script encoding.
Thu Oct 16 06:20:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Oct 16 06:20:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/ruby/test_transcode.rb (TestTranscode#test_errors): * test/ruby/test_transcode.rb (TestTranscode#test_errors):

3
ruby.c
View file

@ -814,7 +814,8 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
} }
if (enc_name) { if (enc_name) {
opt->src.enc.name = rb_str_new2(enc_name); opt->src.enc.name = rb_str_new2(enc_name);
set_external_encoding_once(opt, enc_name, 0); if (!opt->ext.enc.name)
opt->ext.enc.name = opt->src.enc.name;
} }
s++; s++;
} }

4
test/ruby/test_rubyoptions.rb
View file

@ -208,8 +208,8 @@ class TestRubyOptions < Test::Unit::TestCase
ENV['RUBYOPT'] = '-T4' ENV['RUBYOPT'] = '-T4'
assert_in_out_err([], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/) assert_in_out_err([], "", [], /no program input from stdin allowed in tainted mode \(SecurityError\)/)
ENV['RUBYOPT'] = '-KN -Eus-ascii' ENV['RUBYOPT'] = '-Eus-ascii -KN'
assert_in_out_err(%w(-KU -Eutf-8), "p '\u3042'") do |r, e| assert_in_out_err(%w(-Eutf-8 -KU), "p '\u3042'") do |r, e|
assert_equal("\"\u3042\"", r.join.force_encoding(Encoding::UTF_8)) assert_equal("\"\u3042\"", r.join.force_encoding(Encoding::UTF_8))
assert_equal([], e) assert_equal([], e)
end end