From ec0b482e9fd27cb994b30e0f1b8a4d39a85735cc Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Thu, 30 Jun 2016 20:41:07 -0500
Subject: Fix option parsing infrastructure bug.

In main.c: used adjusted string with placeholers for removed options (so flag
values don't move based on config, allowing FORCE_FLAGS to work).

In scripts/mkflags.c: test was wrong, a bare longopt never matches a single
letter command, but it was treated as always matching when comparing
allyesconfig vs current config to determine which options were disabled, so
there was a corner case that got the flag values wrong.
---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index bedb333f..31e51b17 100644
--- a/main.c
+++ b/main.c
@@ -13,7 +13,7 @@
 
 #undef NEWTOY
 #undef OLDTOY
-#define NEWTOY(name, opts, flags) {#name, name##_main, opts, flags},
+#define NEWTOY(name, opts, flags) {#name, name##_main, OPTSTR_##name, flags},
 #define OLDTOY(name, oldname, flags) \
   {#name, oldname##_main, OPTSTR_##oldname, flags},
 
-- 
cgit v1.2.3