diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ruby.c | 18 |
2 files changed, 10 insertions, 11 deletions
@@ -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 before use strncpy(). * 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) Thu Feb 13 01:30:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> @@ -705,19 +705,17 @@ proc_options(argc, argv) 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); script = "-"; } - } - else if (!e_script) { - script = argv[0]; - if (script[0] == '\0') { - script = "-"; - } else { - if (do_search) { + script = argv[0]; + if (script[0] == '\0') { + script = "-"; + } + else if (do_search) { char *path = getenv("RUBYPATH"); script = 0; @@ -732,8 +730,8 @@ proc_options(argc, argv) #ifdef DOSISH translate_char(script, '\\', '/'); #endif + argc--; argv++; } - argc--; argv++; } ruby_script(script); |