From 48ea55969907286d1a125fcd655be9d8307a3449 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 17 Jul 2016 02:14:35 -0500 Subject: 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. --- scripts/mkflags.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'scripts/mkflags.c') 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); -- cgit v1.2.3