diff mbox series

[1/3] kconfig: fix 'invalid option' for help option

Message ID 20210221130318.160327-1-masahiroy@kernel.org (mailing list archive)
State New
Headers show
Series [1/3] kconfig: fix 'invalid option' for help option | expand

Commit Message

Masahiro Yamada Feb. 21, 2021, 1:03 p.m. UTC
scripts/kconfig/conf supports -? option to show the help message.
This is not wired up to Makefile, so nobody would notice this, but
it also shows 'invalid option' message.

  $ ./scripts/kconfig/conf -?
  ./scripts/kconfig/conf: invalid option -- '?'
  Usage: ./scripts/kconfig/conf [-s] [option] <kconfig-file>
  [option] is _one_ of the following:
    --listnewconfig         List new options
    --helpnewconfig         List new options and help text
    --oldaskconfig          Start a new configuration using a line-oriented program

The reason is the '?' is missing in the short option list passed to

While I fixed this issue, I also changed the option '?' to 'h'.
I prefer -h (or --help, if a long option is also desired).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

 scripts/kconfig/conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series


diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 3a98c9e0a7c8..37e17934b67a 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -494,7 +494,7 @@  int main(int ac, char **av)
 	tty_stdio = isatty(0) && isatty(1);
-	while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
+	while ((opt = getopt_long(ac, av, "hs", long_opts, NULL)) != -1) {
 		if (opt == 's') {
@@ -550,7 +550,7 @@  int main(int ac, char **av)
 		case yes2modconfig:
 		case mod2yesconfig:
-		case '?':
+		case 'h':