| Message ID | 1517877294-4826-4-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add Kconfig unit tests | expand |
On Tue, Feb 6, 2018 at 1:34 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > 'make config', 'make oldconfig', etc. always receive '?' as a valid > input and show useful information even if no help text is available. > > ------------------------>8------------------------ > foo (FOO) [N/y] (NEW) ? > > There is no help available for this option. > Symbol: FOO [=n] > Type : bool > Prompt: foo > Defined at Kconfig:1 > ------------------------>8------------------------ > > However, '?' is not shown in the prompt if its help text is missing. > Let's show '?' all the time so that the prompt and the behavior match. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > scripts/kconfig/conf.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c > index 90a76aa2..d346642 100644 > --- a/scripts/kconfig/conf.c > +++ b/scripts/kconfig/conf.c > @@ -201,9 +201,7 @@ static int conf_sym(struct menu *menu) > printf("/m"); > if (oldval != yes && sym_tristate_within_range(sym, yes)) > printf("/y"); > - if (menu_has_help(menu)) > - printf("/?"); > - printf("] "); > + printf("/?] "); > if (!conf_askvalue(sym, sym_get_string_value(sym))) > return 0; > strip(line); > @@ -305,10 +303,7 @@ static int conf_choice(struct menu *menu) > printf("[1]: 1\n"); > goto conf_childs; > } > - printf("[1-%d", cnt); > - if (menu_has_help(menu)) > - printf("?"); > - printf("]: "); > + printf("[1-%d?]: ", cnt); > switch (input_mode) { > case oldconfig: > case silentoldconfig: > -- > 2.7.4 > Reviewed-by: Ulf Magnusson <ulfalizer@gmail.com>
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 90a76aa2..d346642 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -201,9 +201,7 @@ static int conf_sym(struct menu *menu) printf("/m"); if (oldval != yes && sym_tristate_within_range(sym, yes)) printf("/y"); - if (menu_has_help(menu)) - printf("/?"); - printf("] "); + printf("/?] "); if (!conf_askvalue(sym, sym_get_string_value(sym))) return 0; strip(line); @@ -305,10 +303,7 @@ static int conf_choice(struct menu *menu) printf("[1]: 1\n"); goto conf_childs; } - printf("[1-%d", cnt); - if (menu_has_help(menu)) - printf("?"); - printf("]: "); + printf("[1-%d?]: ", cnt); switch (input_mode) { case oldconfig: case silentoldconfig:
'make config', 'make oldconfig', etc. always receive '?' as a valid input and show useful information even if no help text is available. ------------------------>8------------------------ foo (FOO) [N/y] (NEW) ? There is no help available for this option. Symbol: FOO [=n] Type : bool Prompt: foo Defined at Kconfig:1 ------------------------>8------------------------ However, '?' is not shown in the prompt if its help text is missing. Let's show '?' all the time so that the prompt and the behavior match. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/kconfig/conf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- 2.7.4