diff options
| author | Arnaud Lacombe <lacombar@gmail.com> | 2010-08-14 23:57:43 -0400 |
|---|---|---|
| committer | Arnaud Lacombe <lacombar@gmail.com> | 2010-09-19 18:19:26 -0400 |
| commit | ffb5957bc48f64f0773fd3fbc43cb9bb9b38e270 (patch) | |
| tree | 968f267b45d124519d681c086c5bba826b0824b6 /scripts/kconfig/nconf.c | |
| parent | 59dfa24da7cb02b3ccc39f5e74b74fe26ea9626a (diff) | |
| download | linux-stable-ffb5957bc48f64f0773fd3fbc43cb9bb9b38e270.tar.gz linux-stable-ffb5957bc48f64f0773fd3fbc43cb9bb9b38e270.tar.bz2 linux-stable-ffb5957bc48f64f0773fd3fbc43cb9bb9b38e270.zip | |
kconfig: allow build-time definition of the internal config prefix
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/nconf.c')
| -rw-r--r-- | scripts/kconfig/nconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index b8a9f37b036b..da5e45d43f15 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -744,8 +744,8 @@ static void search_conf(void) again: dres = dialog_inputbox(main_window, _("Search Configuration Parameter"), - _("Enter CONFIG_ (sub)string to search for " - "(with or without \"CONFIG\")"), + _("Enter " CONFIG_ " (sub)string to search for " + "(with or without \"" CONFIG_ "\")"), "", dialog_input_result, 99); switch (dres) { case 0: @@ -758,10 +758,10 @@ again: return; } - /* strip CONFIG_ if necessary */ + /* strip the prefix if necessary */ dialog_input = dialog_input_result; - if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0) - dialog_input += 7; + if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0) + dialog_input += strlen(CONFIG_); sym_arr = sym_re_search(dialog_input); res = get_relations_str(sym_arr); @@ -1261,7 +1261,7 @@ static void show_help(struct menu *menu) if (menu && menu->sym && menu_has_help(menu)) { if (menu->sym->name) { - str_printf(&help, "CONFIG_%s:\n\n", menu->sym->name); + str_printf(&help, "%s%s:\n\n", CONFIG_, menu->sym->name); str_append(&help, _(menu_get_help(menu))); str_append(&help, "\n"); get_symbol_str(&help, menu->sym); |