summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-25 08:10:33 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-25 08:10:33 +0000
commit8d1f38c173e15b8216e15a1e735d1ed4ff643709 (patch)
treef06ae2820bc43cc59c8d277819236417b40aead9
parent328ce07c0686f621b8acafb21f9c4fc1e6a52e51 (diff)
downloadruby-8d1f38c173e15b8216e15a1e735d1ed4ff643709.tar.gz
ruby-8d1f38c173e15b8216e15a1e735d1ed4ff643709.tar.xz
ruby-8d1f38c173e15b8216e15a1e735d1ed4ff643709.zip
* ruby.c (proc_options): correct -T option in RUBYOPT.
fixed: [ruby-dev:25512] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ruby.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ab6fff716..d0bccf3b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 25 17:05:15 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ruby.c (proc_options): correct -T option in RUBYOPT.
+ fixed: [ruby-dev:25512]
+
Tue Jan 25 14:05:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
diff --git a/ruby.c b/ruby.c
index 773ef7b81..48b8dba24 100644
--- a/ruby.c
+++ b/ruby.c
@@ -709,11 +709,11 @@ proc_options(argc, argv)
if (rb_safe_level() == 0 && (s = getenv("RUBYOPT"))) {
while (ISSPACE(*s)) s++;
- if (*s == '-' && *(s+1) == 'T') {
+ if (*s == 'T' || *s == '-' && *(s+1) == 'T') {
int numlen;
int v = 1;
- s += 2;
+ if (*s != 'T') ++s;
if (*++s) {
v = scan_oct(s, 2, &numlen);
if (numlen == 0) v = 1;