From 793f5d8fe82f0e3d62fb9d102a76f3cc5901898a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 Jun 2017 02:44:23 +0000
Subject: ruby.c: debug options in command line

* ruby.c (debug_option): parse options in --debug command line
  option same as RUBY_DEBUG env.  available only in the trunk.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 debug.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'debug.c')

diff --git a/debug.c b/debug.c
index 11a1aaddd6..01ac05b61d 100644
--- a/debug.c
+++ b/debug.c
@@ -121,8 +121,8 @@ UINT ruby_w32_codepage[2];
 #endif
 extern int ruby_rgengc_debug;
 
-static void
-set_debug_option(const char *str, int len, void *arg)
+int
+ruby_env_debug_option(const char *str, int len, void *arg)
 {
     int ov;
     size_t retlen;
@@ -131,7 +131,7 @@ set_debug_option(const char *str, int len, void *arg)
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
 	    (var) = (val);		    \
-	    return;			    \
+	    return 1;			    \
 	}				    \
     } while (0)
 #define NAME_MATCH_VALUE(name)				\
@@ -168,7 +168,7 @@ set_debug_option(const char *str, int len, void *arg)
     if (NAME_MATCH_VALUE("rgengc")) {
 	if (!len) ruby_rgengc_debug = 1;
 	else SET_UINT_LIST("rgengc", &ruby_rgengc_debug, 1);
-	return;
+	return 1;
     }
 #if defined _WIN32
 # if RUBY_MSVCRT_VERSION >= 80
@@ -179,10 +179,18 @@ set_debug_option(const char *str, int len, void *arg)
     if (NAME_MATCH_VALUE("codepage")) {
 	if (!len) fprintf(stderr, "missing codepage argument");
 	else SET_UINT_LIST("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage));
-	return;
+	return 1;
     }
 #endif
-    fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+    return 0;
+}
+
+static void
+set_debug_option(const char *str, int len, void *arg)
+{
+    if (!ruby_env_debug_option(str, len, arg)) {
+	fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+    }
 }
 
 void
-- 
cgit v1.2.3