aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-12-31 21:30:59 -0600
committerRob Landley <rob@landley.net>2014-12-31 21:30:59 -0600
commitf3e56f4e4ff773de95fa2c9daf979734d826fc33 (patch)
tree8a8e75b3530b504569ebe4fae09020073534c6db /lib
parent5834ddd6df659d9c9dc7333284fc86762dea061a (diff)
downloadtoybox-f3e56f4e4ff773de95fa2c9daf979734d826fc33.tar.gz
Redo option parsing infrastructure so #define FORCE_FLAGS can unzero flag macros for a disabled command (needed when multiple commands share infrastructure with a common set of flags).
This means the flag space is no longer packed, but leaves gaps where the zeroes go. (Actual flag bit positions are the same for all configs.) Since the option parsing needs to know where the holes are, the OPTSTR values are now generated as part of flags.h with ascii 1 values for the disabled values. (So generated/oldflags.h went away.) This also means that the option string argument for OLDTOY() went away, it now uses the same arguments as the NEWTOY() it references.
Diffstat (limited to 'lib')
-rw-r--r--lib/help.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/help.c b/lib/help.c
index 9965539d..b5d8f6b9 100644
--- a/lib/help.c
+++ b/lib/help.c
@@ -10,7 +10,7 @@ void show_help(void) {;}
#undef NEWTOY
#undef OLDTOY
#define NEWTOY(name,opt,flags) help_##name "\0"
-#define OLDTOY(name,oldname,opts,flags) "\xff" #oldname "\0"
+#define OLDTOY(name,oldname,flags) "\xff" #oldname "\0"
static char *help_data =
#include "generated/newtoys.h"
;