From 4afc46dc8c62b718b48f2108ed44570d97e0f9ad Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 18 Mar 2018 14:58:07 +0000 Subject: [PATCH] merge revision(s) 59970: [Backport #13736] 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 --- ChangeLog | 7 +++++++ ruby.c | 2 +- test/ruby/test_rubyoptions.rb | 2 ++ version.h | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0547c1ded5..4f5680ce06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Mar 18 23:57:32 2018 Nobuyoshi Nakada + + 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 process: block/unblock signals around fork diff --git a/ruby.c b/ruby.c index 7c32d4170d..d84118e140 100644 --- a/ruby.c +++ b/ruby.c @@ -1077,7 +1077,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt) if (v > 0377) rb_rs = Qnil; else if (v == 0 && numlen >= 2) { - rb_rs = rb_str_new2("\n\n"); + rb_rs = rb_str_new2(""); } else { c = v & 0xff; diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 2dee9b5ddc..4495e1e4ea 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -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(-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 def test_autosplit diff --git a/version.h b/version.h index b2b705136b..34aa3424c0 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-18" -#define RUBY_PATCHLEVEL 418 +#define RUBY_PATCHLEVEL 419 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3