diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-09 14:25:37 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-09 14:25:37 +0000 |
commit | 98eb63a8963c4c230a8c130046c741dd2ef2a78c (patch) | |
tree | 4f74cbc3305a9493e8287add1f6a4d8ba95eacf3 | |
parent | b014387f68411f16c502a25982c4e26df27887c7 (diff) |
merge revision(s) 64900: [Backport #15190]
Just a shebang is valid code
[ruby-core:89240] [Bug #15190]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ruby.c | 6 | ||||
-rw-r--r-- | test/ruby/test_rubyoptions.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 5 insertions, 6 deletions
@@ -1836,11 +1836,7 @@ load_file_internal(VALUE argp_v) c = rb_io_getbyte(f); if (c == INT2FIX('#')) { c = rb_io_getbyte(f); - if (c == INT2FIX('!')) { - line = rb_io_gets(f); - if (NIL_P(line)) - return 0; - + if (c == INT2FIX('!') && !NIL_P(line = rb_io_gets(f))) { RSTRING_GETMEM(line, str, len); warn_cr_in_shebang(str, len); if ((p = strstr(str, ruby_engine)) == 0) { diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index da8f4e0fa7..54213c4698 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -344,6 +344,9 @@ class TestRubyOptions < Test::Unit::TestCase %w[4], [], bug4118) assert_ruby_status(%w[], "#! ruby -- /", '[ruby-core:82267] [Bug #13786]') + + assert_ruby_status(%w[], "#!") + assert_in_out_err(%w[-c], "#!", ["Syntax OK"]) end def test_flag_in_shebang @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.2" #define RUBY_RELEASE_DATE "2018-10-09" -#define RUBY_PATCHLEVEL 93 +#define RUBY_PATCHLEVEL 94 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 10 |