diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-02-05 19:34:43 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-02-08 14:10:09 -0500 |
commit | 4f208f392103e8d5bcc7558dba69348b27d8ce42 (patch) | |
tree | 829ca771d530086527ecb69abfe03d2c63200ba7 | |
parent | cb67ab2cd2b8abd9650292c986c79901e3073a59 (diff) |
kconfig: show '?' prompt even if no help text is available
'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>
Reviewed-by: Ulf Magnusson <ulfalizer@gmail.com>
-rw-r--r-- | scripts/kconfig/conf.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 307bc3f7b945..fc446acbf6d6 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -199,9 +199,7 @@ static int conf_sym(struct menu *menu) | |||
199 | printf("/m"); | 199 | printf("/m"); |
200 | if (oldval != yes && sym_tristate_within_range(sym, yes)) | 200 | if (oldval != yes && sym_tristate_within_range(sym, yes)) |
201 | printf("/y"); | 201 | printf("/y"); |
202 | if (menu_has_help(menu)) | 202 | printf("/?] "); |
203 | printf("/?"); | ||
204 | printf("] "); | ||
205 | if (!conf_askvalue(sym, sym_get_string_value(sym))) | 203 | if (!conf_askvalue(sym, sym_get_string_value(sym))) |
206 | return 0; | 204 | return 0; |
207 | strip(line); | 205 | strip(line); |
@@ -303,10 +301,7 @@ static int conf_choice(struct menu *menu) | |||
303 | printf("[1]: 1\n"); | 301 | printf("[1]: 1\n"); |
304 | goto conf_childs; | 302 | goto conf_childs; |
305 | } | 303 | } |
306 | printf("[1-%d", cnt); | 304 | printf("[1-%d?]: ", cnt); |
307 | if (menu_has_help(menu)) | ||
308 | printf("?"); | ||
309 | printf("]: "); | ||
310 | switch (input_mode) { | 305 | switch (input_mode) { |
311 | case oldconfig: | 306 | case oldconfig: |
312 | case silentoldconfig: | 307 | case silentoldconfig: |