diff options
| -rw-r--r-- | ruby.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -731,11 +731,11 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt) while (ISSPACE(*s)) s++; if (!*s) return; - argstr = rb_str_tmp_new((len = strlen(s)) + 2); + argstr = rb_str_tmp_new((len = strlen(s)) + (envopt!=0)); argary = rb_str_tmp_new(0); p = RSTRING_PTR(argstr); - *p++ = ' '; + if (envopt) *p++ = ' '; memcpy(p, s, len + 1); ap = 0; rb_str_cat(argary, (char *)&ap, sizeof(ap)); @@ -752,7 +752,7 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt) rb_str_cat(argary, (char *)&ap, sizeof(ap)); argv = (char **)RSTRING_PTR(argary); - while ((i = proc_options(argc, argv, opt, envopt)) > 1 && (argc -= i) > 0) { + while ((i = proc_options(argc, argv, opt, envopt)) > 1 && envopt && (argc -= i) > 0) { argv += i; if (**argv != '-') { *--*argv = '-'; diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index c7d1bcdea4..d6297c8979 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -338,6 +338,8 @@ class TestRubyOptions < Test::Unit::TestCase %w[4], [], bug4118) assert_in_out_err(%w[-x], "#!/bin/sh\n""#!shebang\n""#!ruby\n""puts __LINE__\n", %w[4], [], bug4118) + + assert_ruby_status(%w[], "#! ruby -- /", '[ruby-core:82267] [Bug #13786]') end def test_sflag |