nconfig: Fix help for choice menus
PATCH 1/1 nconfig: Fix help for choice menus
When getting the help for a choice menu with a help section (for example the "Choose SLAB allocator" menu) nconfig pops up a window with nothing inside it. This is due to show_help() passing an empty string to show_scroll_win()'s 3rd argument. The option really does have help though, but it isn't a config symbol, so just add the help text for the option, and don't try to add anything else like the config option name.
--- scripts/kconfig/nconf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
scripts/kconfig/nconf.c +2 -0
@@ -1252,6 +1252,8 @@ static void show_help(struct menu *menu)str_append (&help,_ (menu_get_help (menu)));str_append (&help,"\n" );get_symbol_str (&help, menu->sym); + }else { +str_append (&help,_ (menu_get_help (menu))); } }else {str_append (&help, nohelp_text);
Signature · 1 line
1.7.2.3.313.gcd15
Quoted 7 lines · Stephen Boyd
When getting the help for a choice menu with a help section (for example the "Choose SLAB allocator" menu) nconfig pops up a window with nothing inside it. This is due to
show_help()passing an empty string to show_scroll_win()'s 3rd argument. The option really does have help though, but it isn't a config symbol, so just add the help text for the option, and don't try to add anything else like the config option name.
Quoted 23 lines
Signed-off-by Stephen Boyd <[email protected]>Cc Nir Tzachar <[email protected]>---
scripts/kconfig/nconf.c | 2 ++1 files changed, 2 insertions(+), 0 deletions(-)scripts/kconfig/nconf.c +2
-1@@ -1252,6 +1252,8 @@ static void show_help(struct menu *menu) str_append(&help, _(menu_get_help(menu))); str_append(&help, "\n"); get_symbol_str(&help, menu->sym); + } else { + str_append(&help, _(menu_get_help(menu))); } } else { str_append(&help, nohelp_text); --1.7.2.3.313.gcd15
Michal Marek
AppliedQuoted 11 lines · Nir Tzachar
Quoted 7 lines · Stephen Boyd
When getting the help for a choice menu with a help section (for example the "Choose SLAB allocator" menu) nconfig pops up a window with nothing inside it. This is due to
show_help()passing an empty string to show_scroll_win()'s 3rd argument. The option really does have help though, but it isn't a config symbol, so just add the help text for the option, and don't try to add anything else like the config option name.Acked-by Nir Tzachar <[email protected]>
Thanks, applied.
Michal