From: Rob Landley <rob@landley.net>
Date: Sun, 17 Jul 2016 07:14:35 +0000 (-0500)
Subject: The recent option parsing changes broke the multiplexer, because the "toybox"
X-Git-Tag: android-x86-7.1-r1~6^2~4^2~29
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-toybox.git;a=commitdiff_plain;h=48ea55969907286d1a125fcd655be9d8307a3449

The recent option parsing changes broke the multiplexer, because the "toybox"
command was trying to parse their options and failing. (Commands
that aren't just disabled but have no option string even in the allyesconfig
case need an OPTSTR of 0.)

This is probably only a partial fix, there's some design work to think through
here.
---

diff --git a/scripts/mkflags.c b/scripts/mkflags.c
index 27fc5172..39b935bb 100644
--- a/scripts/mkflags.c
+++ b/scripts/mkflags.c
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
 
   for (;;) {
     struct flag *flist, *aflist, *offlist;
-    char *mgaps;
+    char *mgaps = 0;
     unsigned bit;
 
     *command = *flags = *allflags = 0;
@@ -141,11 +141,13 @@ int main(int argc, char *argv[])
 
     bit = 0;
     printf("// %s %s %s\n", command, flags, allflags);
-    mgaps = mark_gaps(flags, allflags);
+    if (*flags != ' ') mgaps = mark_gaps(flags, allflags);
+    else if (*allflags != ' ') mgaps = allflags;
     // If command disabled, use allflags for OLDTOY()
-    printf("#undef OPTSTR_%s\n#define OPTSTR_%s \"%s\"\n",
-            command, command, strcmp(flags, " ") ? mgaps : allflags);
-    free(mgaps);
+    printf("#undef OPTSTR_%s\n#define OPTSTR_%s ", command, command);
+    if (mgaps) printf("\"%s\"\n", mgaps);
+    else printf("0\n");
+    if (mgaps != allflags) free(mgaps);
 
     flist = digest(flags);
     offlist = aflist = digest(allflags);