summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-22 15:29:53 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-22 15:29:53 +0000
commitb294a022671fd6740e7f3a42ce19dbaa11dd7d6c (patch)
tree552dc17ba2a4b98b9eace34f4076bb1bc71513cd
parentfbd6a53cfbc84a4017252039a4b1a7f1005d68ca (diff)
downloadruby-b294a022671fd6740e7f3a42ce19dbaa11dd7d6c.tar.gz
ruby-b294a022671fd6740e7f3a42ce19dbaa11dd7d6c.tar.xz
ruby-b294a022671fd6740e7f3a42ce19dbaa11dd7d6c.zip
* ruby.c (proc_options): allow space after -E (encoding) option.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 291d8fcf7..5db0de982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ Mon Oct 22 11:03:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/encoding.h (rb_enc_compatible): prototype.
+Mon Oct 22 19:24:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ruby.c (proc_options): allow space after -E (encoding) option.
+
Sun Oct 21 18:29:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_default, rb_enc_primary): return pointers to
diff --git a/ruby.c b/ruby.c
index ffdf45a15..8b14419e7 100644
--- a/ruby.c
+++ b/ruby.c
@@ -689,7 +689,8 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
case 'E':
if (!*++s) {
- rb_raise(rb_eRuntimeError, "missing argument for -E");
+ s = argv[1];
+ argc--, argv++;
}
goto encoding;