cmdline

Author: tsjensen

src/cmdline.c

@@ -60,7 +60,7 @@ extern int optind;     /* for getopt() */
 #endif
 
 #define EXTRA_UNDOC "(undoc)"
-#define EXTRA_DEBUG "debug:"
+#define EXTRA_DEBUG "debug"
 
 
 
@@ -111,7 +111,7 @@ void usage_long(FILE *st)
     fprintf(st, "  -t, --tabs <str>      Tab stop distance and expansion [default: %de]\n", DEF_TABSTOP);
     fprintf(st, "  -v, --version         Print version information\n");
     /* fprintf(st, "  -x, --extra <arg>     If <arg> starts with "debug:", activate debug logging for specified log
-                areas which follow in a comma-separated list [default area: MAIN]. If <arg> is "undoc", trigger
+                areas which follow in a comma-separated list [default area: MAIN]. If <arg> is "(undoc)", trigger
                 undocumented behavior of design detail lister.");  // undocumented */
 
     bxs_free(config_file);
@@ -562,6 +562,48 @@ static int tab_handling(opt_t *result, char *optarg)
 
 
 
+/**
+ * Handle undocumented options (-x).
+ * @param result the options struct we are building
+ * @param optarg the argument to `-x` on the command line
+ * @returns 0 on success, anything else on error
+ */
+static int undocumented_options(opt_t *result, char *optarg)
+{
+    char *s = optarg;
+
+    if (strncmp(s, EXTRA_UNDOC, strlen(EXTRA_UNDOC)) == 0) {
+        result->qundoc = 1;
+        s += strlen(EXTRA_UNDOC);
+    }
+
+    if (strncasecmp(s, EXTRA_DEBUG, strlen(EXTRA_DEBUG)) == 0) {
+        s += strlen(EXTRA_DEBUG);
+        if (*s == ':') {
+            if (debug_areas(result, s + 1) != 0) {
+                return 1;
+            }
+        }
+        else if (*s == '\0') {
+            /* default to MAIN */
+            debug_areas(result, NULL);
+        }
+        else {
+            bx_fprintf(stderr, "%s: invalid option -x %s\n", PROJECT, optarg);
+            return 2;
+        }
+        activate_debug_logging(result->debug);
+    }
+
+    if (!result->qundoc && !is_debug_activated()) {
+        bx_fprintf(stderr, "%s: invalid option -x %s\n", PROJECT, optarg);
+        return 3;
+    }
+    return 0;
+}
+
+
+
 /**
  * Set *stdout* to binary mode, so that we can control the line terminator. This function only ever does anything on
  * Windows, because on Linux, we already do have control over line terminators.
@@ -733,7 +775,6 @@ opt_t *process_commandline(int argc, char *argv[])
     };
     const char *short_options = "a:c:d:e:f:hi:k:lmn:p:q:rs:t:vx:";
 
-    char *s;
     int oc;   /* option character */
     do {
         oc = getopt_long(argc, argv, short_options, long_options, &option_index);
@@ -866,18 +907,9 @@ opt_t *process_commandline(int argc, char *argv[])
                 return result;
 
             case 'x':
-                s = optarg;
-                if (strncmp(s, EXTRA_UNDOC, strlen(EXTRA_UNDOC)) == 0) {
-                    result->qundoc = 1;
-                    s += strlen(EXTRA_UNDOC);
-                }
-                if (strncasecmp(s, EXTRA_DEBUG, strlen(EXTRA_DEBUG)) == 0) {
-                    s += strlen(EXTRA_DEBUG);
-                    if (debug_areas(result, s) != 0) {
-                        BFREE(result);
-                        return NULL;
-                    }
-                    activate_debug_logging(result->debug);
+                if (undocumented_options(result, optarg) != 0) {
+                    BFREE(result);
+                    return NULL;
                 }
                 break;