1 files changed, 18 insertions, 19 deletions

diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 87d4b15da95..39ca1f1640e 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -83,10 +83,10 @@ static const char nconf_readme[] = N_(
 "Text Box    (Help Window)\n"
 "--------\n"
 "o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
-"   keys h,j,k,l function here as do <u>, <d> and <SPACE BAR> for\n"
-"   those who are familiar with less and lynx.\n"
+"   keys h,j,k,l function here as do <SPACE BAR> for those\n"
+"   who are familiar with less and lynx.\n"
 "\n"
-"o  Press <Enter>, <F1>, <F5>, <F9>, <q> or <Esc> to exit.\n"
+"o  Press <Enter>, <F1>, <F5>, <F7> or <Esc> to exit.\n"
 "\n"
 "\n"
 "Alternate Configuration Files\n"
@@ -182,6 +182,8 @@ setmod_text[] = N_(
 "This feature depends on another which\n"
 "has been configured as a module.\n"
 "As a result, this feature will be built as a module."),
+nohelp_text[] = N_(
+"There is no help available for this option.\n"),
 load_config_text[] = N_(
 "Enter the name of the configuration file you wish to load.\n"
 "Accept the name shown to restore the configuration you\n"
@@ -223,7 +225,7 @@ search_help[] = N_(
 "Defined at drivers/pci/Kconfig:47\n"
 "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
 "Location:\n"
-"  -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
+"  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
 "    -> PCI support (PCI [ = y])\n"
 "      -> PCI access mode (<choice> [ = y])\n"
 "Selects: LIBCRC32\n"
@@ -278,9 +280,6 @@ static int global_exit;
 /* the currently selected button */
 const char *current_instructions = menu_instructions;
 
-static char *dialog_input_result;
-static int dialog_input_result_len;
-
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
@@ -696,6 +695,7 @@ static void search_conf(void)
 {
         struct symbol **sym_arr;
         struct gstr res;
+        char dialog_input_result[100];
         char *dialog_input;
         int dres;
 again:
@@ -703,7 +703,7 @@ again:
                         _("Search Configuration Parameter"),
                         _("Enter " CONFIG_ " (sub)string to search for "
                                 "(with or without \"" CONFIG_ "\")"),
-                        "", &dialog_input_result, &dialog_input_result_len);
+                        "", dialog_input_result, 99);
         switch (dres) {
         case 0:
                 break;
@@ -721,7 +721,7 @@ again:
                 dialog_input += strlen(CONFIG_);
 
         sym_arr = sym_re_search(dialog_input);
-        res = get_relations_str(sym_arr, NULL);
+        res = get_relations_str(sym_arr);
         free(sym_arr);
         show_scroll_win(main_window,
                         _("Search Results"), str_get(&res));
@@ -1348,6 +1348,7 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
+        char dialog_input_result[256];
 
         while (1) {
                 int res;
@@ -1370,8 +1371,8 @@ static void conf_string(struct menu *menu)
                                 prompt ? _(prompt) : _("Main Menu"),
                                 heading,
                                 sym_get_string_value(menu->sym),
-                                &dialog_input_result,
-                                &dialog_input_result_len);
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
                 switch (res) {
                 case 0:
                         if (sym_set_string_value(menu->sym,
@@ -1391,13 +1392,14 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
+        char dialog_input_result[256];
         while (1) {
                 int res;
                 res = dialog_inputbox(main_window,
                                 NULL, load_config_text,
                                 filename,
-                                &dialog_input_result,
-                                &dialog_input_result_len);
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
@@ -1422,13 +1424,14 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
+        char dialog_input_result[256];
         while (1) {
                 int res;
                 res = dialog_inputbox(main_window,
                                 NULL, save_config_text,
                                 filename,
-                                &dialog_input_result,
-                                &dialog_input_result_len);
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
@@ -1503,11 +1506,7 @@ int main(int ac, char **av)
         }
 
         notimeout(stdscr, FALSE);
-#if NCURSES_REENTRANT
-        set_escdelay(1);
-#else
         ESCDELAY = 1;
-#endif
 
         /* set btns menu */
         curses_menu = new_menu(curses_menu_items);