archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 59970: [Backport #13736]

Browse source 
ruby.c: paragraph mode by -00

	* ruby.c (proc_options): set to paragraph mode, if -00 is given,
	  as well as perl and -R0 option in 0.49.
	  [ruby-core:81987] [Bug #13736]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-03-18 14:58:07 +00:00
parent cfb61e5962
commit 4afc46dc8c
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sun Mar 18 23:57:32 2018 Nobuyoshi Nakada <nobu@ruby-lang.org>
ruby.c: paragraph mode by -00
* ruby.c (proc_options): set to paragraph mode, if -00 is given, as
well as perl and -R0 option in 0.49. [Bug #13736]
Sun Mar 18 23:55:23 2018 Eric Wong <normalperson@yhbt.net> Sun Mar 18 23:55:23 2018 Eric Wong <normalperson@yhbt.net>
process: block/unblock signals around fork process: block/unblock signals around fork

2
ruby.c
View file

@ -1077,7 +1077,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
if (v > 0377) if (v > 0377)
rb_rs = Qnil; rb_rs = Qnil;
else if (v == 0 && numlen >= 2) { else if (v == 0 && numlen >= 2) {
rb_rs = rb_str_new2("\n\n"); rb_rs = rb_str_new2("");
} }
else { else {
c = v & 0xff; c = v & 0xff;

2
test/ruby/test_rubyoptions.rb
View file

@ -170,6 +170,8 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(%w(-0141 -e) + ["print gets"], "foo\nbar\0baz", %w(foo ba), []) assert_in_out_err(%w(-0141 -e) + ["print gets"], "foo\nbar\0baz", %w(foo ba), [])
assert_in_out_err(%w(-0e) + ["print gets"], "foo\nbar\0baz", %W(foo bar\0), []) assert_in_out_err(%w(-0e) + ["print gets"], "foo\nbar\0baz", %W(foo bar\0), [])
assert_in_out_err(%w(-00 -e) + ["p gets, gets"], "foo\nbar\n\n\n\nbaz\n", %w("foo\nbar\n\n" "baz\n"), [])
end end
def test_autosplit def test_autosplit

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.7" #define RUBY_VERSION "2.3.7"
#define RUBY_RELEASE_DATE "2018-03-18" #define RUBY_RELEASE_DATE "2018-03-18"
#define RUBY_PATCHLEVEL 418 #define RUBY_PATCHLEVEL 419
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3