1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby.c: warn_cr_in_shebang

Browse Source 
* ruby.c (load_file_internal): warn if shebang line ends with a
  carriage return.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-03-04 13:27:36 +00:00
parent d04ee29e77
commit 6b327e72c3
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruby.c
View File

@ -1668,6 +1668,14 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
return (VALUE)iseq; return (VALUE)iseq;
} }
static void
warn_cr_in_shebang(const char *str, long len)
{
if (str[len-1] == '\n' && str[len-2] == '\r') {
rb_warn("shebang line ends with \\r may cause a problem");
}
}
struct load_file_arg { struct load_file_arg {
VALUE parser; VALUE parser;
VALUE fname; VALUE fname;
@ -1715,6 +1723,7 @@ load_file_internal(VALUE argp_v)
line_start++; line_start++;
RSTRING_GETMEM(line, str, len); RSTRING_GETMEM(line, str, len);
if (len > 2 && str[0] == '#' && str[1] == '!') { if (len > 2 && str[0] == '#' && str[1] == '!') {
if (line_start == 1) warn_cr_in_shebang(str, len);
if ((p = strstr(str+2, ruby_engine)) != 0) { if ((p = strstr(str+2, ruby_engine)) != 0) {
goto start_read; goto start_read;
} }
@ -1732,6 +1741,7 @@ load_file_internal(VALUE argp_v)
return 0; return 0;
RSTRING_GETMEM(line, str, len); RSTRING_GETMEM(line, str, len);
warn_cr_in_shebang(str, len);
if ((p = strstr(str, ruby_engine)) == 0) { if ((p = strstr(str, ruby_engine)) == 0) {
/* not ruby script, assume -x flag */ /* not ruby script, assume -x flag */
goto search_shebang; goto search_shebang;

2
test/ruby/test_rubyoptions.rb
View File

@ -313,7 +313,7 @@ class TestRubyOptions < Test::Unit::TestCase
[], /: no Ruby script found in input/) [], /: no Ruby script found in input/)
assert_in_out_err([{'RUBYOPT' => nil}], "#!ruby -KU -Eutf-8\r\np \"\u3042\"\r\n", assert_in_out_err([{'RUBYOPT' => nil}], "#!ruby -KU -Eutf-8\r\np \"\u3042\"\r\n",
["\"\u3042\""], [], ["\"\u3042\""], /shebang line ends with \\r/,
encoding: Encoding::UTF_8) encoding: Encoding::UTF_8)
bug4118 = '[ruby-dev:42680]' bug4118 = '[ruby-dev:42680]'