From b3b3ff29b5e266c1fb9d2c5b5581614155b60f60 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 23 Feb 2008 20:25:29 +0000 Subject: * ruby.c (proc_options): check if argument for -E exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index 6574e1e995..04a4fe413c 100644 --- a/ruby.c +++ b/ruby.c @@ -539,7 +539,7 @@ moreswitches(const char *s, struct cmdline_options *opt) static int proc_options(int argc, char **argv, struct cmdline_options *opt) { - int argc0 = argc; + int n, argc0 = argc; const char *s; if (argc == 0) @@ -707,10 +707,7 @@ proc_options(int argc, char **argv, struct cmdline_options *opt) break; case 'E': - if (!*++s) { - s = argv[1]; - argc--, argv++; - } + if (!*++s) goto next_encoding; goto encoding; case 'K': @@ -797,18 +794,17 @@ proc_options(int argc, char **argv, struct cmdline_options *opt) } else if (strcmp("disable-gems", s) == 0) opt->disable_gems = 1; - else if (strcmp("encoding", s) == 0) { - if (!--argc || !(s = *++argv)) { - noencoding: - rb_raise(rb_eRuntimeError, "missing argument for --encoding"); + else if (strncmp("encoding", s, n = 8) == 0 && (!s[n] || s[n] == '=')) { + s += n; + if (!*s++) { + next_encoding: + if (!--argc || !(s = *++argv)) { + rb_raise(rb_eRuntimeError, "missing argument for --encoding"); + } } encoding: opt->ext.enc.name = rb_str_new2(s); } - else if (strncmp("encoding=", s, 9) == 0) { - if (!*(s += 9)) goto noencoding; - goto encoding; - } else if (strcmp("version", s) == 0) opt->version = 1; else if (strcmp("verbose", s) == 0) { -- cgit v1.2.3