Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66c4bd80 authored by Cheng Renquan's avatar Cheng Renquan Committed by Sam Ravnborg
Browse files

kconfig: make use of menu_get_ext_help in "make config" 



Signed-off-by: default avatarCheng Renquan <crquan@gmail.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent d74c15f3

scripts/kconfig/conf.c

+11 −11
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ static int conf_cnt; 
static char line[128];

static struct menu *rootEntry;



static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");



static const char *get_help(struct menu *menu)

static void print_help(struct menu *menu)

{

	if (menu_has_help(menu))

		return _(menu_get_help(menu));

	else

		return nohelp_text;

	struct gstr help = str_new();



	menu_get_ext_help(menu, &help);



	printf("\n%s\n", str_get(&help));

	str_free(&help);

}



static void strip(char *str)
@@ -140,7 +140,7 @@ int conf_string(struct menu *menu) 
		case '?':

			/* print help */

			if (line[1] == '\n') {

				printf("\n%s\n", get_help(menu));

				print_help(menu);

				def = NULL;

				break;

			}
@@ -220,7 +220,7 @@ static int conf_sym(struct menu *menu) 
		if (sym_set_tristate_value(sym, newval))

			return 0;

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);

			strip(line);

			if (line[0] == '?') {

				printf("\n%s\n", get_help(menu));

				print_help(menu);

				continue;

			}

			if (!line[0])
@@ -331,7 +331,7 @@ static int conf_choice(struct menu *menu) 
		if (!child)

			continue;

		if (line[strlen(line) - 1] == '?') {

			printf("\n%s\n", get_help(child));

			print_help(child);

			continue;

		}

		sym_set_choice_value(sym, child->sym);