kconfig: make use of menu_get_ext_help in "make config"
Signed-off-by: Cheng Renquan <crquan@gmail.com> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
d74c15f3b7
commit
66c4bd8085
|
@ -38,14 +38,14 @@ static int conf_cnt;
|
||||||
static char line[128];
|
static char line[128];
|
||||||
static struct menu *rootEntry;
|
static struct menu *rootEntry;
|
||||||
|
|
||||||
static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
|
static void print_help(struct menu *menu)
|
||||||
|
|
||||||
static const char *get_help(struct menu *menu)
|
|
||||||
{
|
{
|
||||||
if (menu_has_help(menu))
|
struct gstr help = str_new();
|
||||||
return _(menu_get_help(menu));
|
|
||||||
else
|
menu_get_ext_help(menu, &help);
|
||||||
return nohelp_text;
|
|
||||||
|
printf("\n%s\n", str_get(&help));
|
||||||
|
str_free(&help);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void strip(char *str)
|
static void strip(char *str)
|
||||||
|
@ -140,7 +140,7 @@ int conf_string(struct menu *menu)
|
||||||
case '?':
|
case '?':
|
||||||
/* print help */
|
/* print help */
|
||||||
if (line[1] == '\n') {
|
if (line[1] == '\n') {
|
||||||
printf("\n%s\n", get_help(menu));
|
print_help(menu);
|
||||||
def = NULL;
|
def = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -220,7 +220,7 @@ static int conf_sym(struct menu *menu)
|
||||||
if (sym_set_tristate_value(sym, newval))
|
if (sym_set_tristate_value(sym, newval))
|
||||||
return 0;
|
return 0;
|
||||||
help:
|
help:
|
||||||
printf("\n%s\n", get_help(menu));
|
print_help(menu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -307,7 +307,7 @@ static int conf_choice(struct menu *menu)
|
||||||
fgets(line, 128, stdin);
|
fgets(line, 128, stdin);
|
||||||
strip(line);
|
strip(line);
|
||||||
if (line[0] == '?') {
|
if (line[0] == '?') {
|
||||||
printf("\n%s\n", get_help(menu));
|
print_help(menu);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!line[0])
|
if (!line[0])
|
||||||
|
@ -331,7 +331,7 @@ static int conf_choice(struct menu *menu)
|
||||||
if (!child)
|
if (!child)
|
||||||
continue;
|
continue;
|
||||||
if (line[strlen(line) - 1] == '?') {
|
if (line[strlen(line) - 1] == '?') {
|
||||||
printf("\n%s\n", get_help(child));
|
print_help(child);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
sym_set_choice_value(sym, child->sym);
|
sym_set_choice_value(sym, child->sym);
|
||||||
|
|
Loading…
Reference in New Issue