kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ruby.c (proc_options): script argument is in effect only when -e is not given.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-02-13 03:02:19 +00:00
parent 2f7ee35065
commit 050f2d8460
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,9 +1,10 @@
Thu Feb 13 09:58:12 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> Thu Feb 13 11:54:50 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* ruby.c (ruby_init_loadpath): ensures buffer terminated * ruby.c (ruby_init_loadpath): ensures buffer terminated
before use strncpy(). before use strncpy().
* ruby.c (proc_options): avoid SEGV at -S with no arguments. * ruby.c (proc_options): avoid SEGV at -S with no arguments.
script argument is in effect only when -e is not given.
(ruby-bugs-ja:PR#391) (ruby-bugs-ja:PR#391)
Thu Feb 13 01:30:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> Thu Feb 13 01:30:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>

18
ruby.c
View file

@ -705,19 +705,17 @@ proc_options(argc, argv)
OBJ_TAINT(rb_load_path); OBJ_TAINT(rb_load_path);
} }
if (argc == 0) { /* no more args */ if (!e_script) {
if (!e_script) { if (argc == 0) { /* no more args */
if (verbose) exit(0); if (verbose) exit(0);
script = "-"; script = "-";
} }
}
else if (!e_script) {
script = argv[0];
if (script[0] == '\0') {
script = "-";
}
else { else {
if (do_search) { script = argv[0];
if (script[0] == '\0') {
script = "-";
}
else if (do_search) {
char *path = getenv("RUBYPATH"); char *path = getenv("RUBYPATH");
script = 0; script = 0;
@ -732,8 +730,8 @@ proc_options(argc, argv)
#ifdef DOSISH #ifdef DOSISH
translate_char(script, '\\', '/'); translate_char(script, '\\', '/');
#endif #endif
argc--; argv++;
} }
argc--; argv++;
} }
ruby_script(script); ruby_script(script);