Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputbox
  scripts/kconfig/nconf: fix editing long strings
  scripts/kconfig/nconf: dynamically alloc dialog_input_result
  scripts/kconfig/nconf: fix memmove's length arg
  scripts/kconfig/nconf: fix typo: unknow => unknown
  kconfig: fix set but not used variables
  kconfig: handle SIGINT in menuconfig
  kconfig: fix __enabled_ macros definition for invisible and un-selected symbols
  kconfig: factor code in menu_get_ext_help()
  kbuild: Fix help text not displayed in choice option.
  kconfig/nconf: nuke unreferenced `nohelp_text'
  kconfig/streamline_config.pl: merge local{mod,yes}config
  kconfig/streamline_config.pl: use options to determine operating mode
  kconfig/streamline_config.pl: directly access LSMOD from the environment

9 files changed, 173 insertions, 112 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 82d2eb285b70..ba573fe7c74d 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -33,17 +33,9 @@ silentoldconfig: $(obj)/conf
         $(Q)mkdir -p include/generated
         $< --$@ $(Kconfig)
 
-# if no path is given, then use src directory to find file
-ifdef LSMOD
-LSMOD_F := $(LSMOD)
-ifeq ($(findstring /,$(LSMOD)),)
-  LSMOD_F := $(objtree)/$(LSMOD)
-endif
-endif
-
-localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         $(Q)mkdir -p include/generated
-        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
+        $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
         $(Q)if [ -f .config ]; then                                     \
                         cmp -s .tmp.config .config ||                   \
                         (mv -f .config .config.old.1;                   \
@@ -56,22 +48,6 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         fi
         $(Q)rm -f .tmp.config
 
-localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
-        $(Q)mkdir -p include/generated
-        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
-        $(Q)sed -i s/=m/=y/ .tmp.config
-        $(Q)if [ -f .config ]; then                                     \
-                        cmp -s .tmp.config .config ||                   \
-                        (mv -f .config .config.old.1;                   \
-                         mv -f .tmp.config .config;                     \
-                         $(obj)/conf --silentoldconfig $(Kconfig);      \
-                         mv -f .config.old.1 .config.old)               \
-        else                                                            \
-                        mv -f .tmp.config .config;                      \
-                        $(obj)/conf --silentoldconfig $(Kconfig);       \
-        fi
-        $(Q)rm -f .tmp.config
-
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 59b667cae5f3..5a58965d8800 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -503,17 +503,6 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
                         fprintf(fp, "#define %s%s%s 1\n",
                             CONFIG_, sym->name, suffix);
                 }
-                /*
-                 * Generate the __enabled_CONFIG_* and
-                 * __enabled_CONFIG_*_MODULE macros for use by the
-                 * IS_{ENABLED,BUILTIN,MODULE} macros. The _MODULE variant is
-                 * generated even for booleans so that the IS_ENABLED() macro
-                 * works.
-                 */
-                fprintf(fp, "#define __enabled_" CONFIG_ "%s %d\n",
-                                sym->name, (*value == 'y'));
-                fprintf(fp, "#define __enabled_" CONFIG_ "%s_MODULE %d\n",
-                                sym->name, (*value == 'm'));
                 break;
         }
         case S_HEX: {
@@ -565,6 +554,35 @@ static struct conf_printer header_printer_cb =
 };
 
 /*
+ * Generate the __enabled_CONFIG_* and __enabled_CONFIG_*_MODULE macros for
+ * use by the IS_{ENABLED,BUILTIN,MODULE} macros. The _MODULE variant is
+ * generated even for booleans so that the IS_ENABLED() macro works.
+ */
+static void
+header_print__enabled_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
+{
+
+        switch (sym->type) {
+        case S_BOOLEAN:
+        case S_TRISTATE: {
+                fprintf(fp, "#define __enabled_" CONFIG_ "%s %d\n",
+                    sym->name, (*value == 'y'));
+                fprintf(fp, "#define __enabled_" CONFIG_ "%s_MODULE %d\n",
+                    sym->name, (*value == 'm'));
+                break;
+        }
+        default:
+                break;
+        }
+}
+
+static struct conf_printer header__enabled_printer_cb =
+{
+        .print_symbol = header_print__enabled_symbol,
+        .print_comment = header_print_comment,
+};
+
+/*
  * Tristate printer
  *
  * This printer is used when generating the `include/config/tristate.conf' file.
@@ -945,11 +963,16 @@ int conf_write_autoconf(void)
         conf_write_heading(out_h, &header_printer_cb, NULL);
 
         for_all_symbols(i, sym) {
+                if (!sym->name)
+                        continue;
+
                 sym_calc_value(sym);
-                if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
+
+                conf_write_symbol(out_h, sym, &header__enabled_printer_cb, NULL);
+
+                if (!(sym->flags & SYMBOL_WRITE))
                         continue;
 
-                /* write symbol to auto.conf, tristate and header files */
                 conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);
 
                 conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index c704712d0227..154c2dd245b7 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -320,7 +320,6 @@ static void print_page(WINDOW * win, int height, int width)
  */
 static void print_line(WINDOW * win, int row, int width)
 {
-        int y, x;
         char *line;
 
         line = get_line();
@@ -329,10 +328,10 @@ static void print_line(WINDOW * win, int row, int width)
         waddch(win, ' ');
         waddnstr(win, line, MIN(strlen(line), width - 2));
 
-        getyx(win, y, x);
         /* Clear 'residue' of previous line */
 #if OLD_NCURSES
         {
+                int x = getcurx(win);
                 int i;
                 for (i = 0; i < width - x; i++)
                         waddch(win, ' ');
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 820d2b6800fb..19e200d91120 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -15,6 +15,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <unistd.h>
 #include <locale.h>
 
@@ -272,6 +273,7 @@ static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
 static int show_all_options;
+static int saved_x, saved_y;
 
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
@@ -792,9 +794,54 @@ static void conf_save(void)
         }
 }
 
+static int handle_exit(void)
+{
+        int res;
+
+        dialog_clear();
+        if (conf_get_changed())
+                res = dialog_yesno(NULL,
+                                   _("Do you wish to save your new configuration ?\n"
+                                     "<ESC><ESC> to continue."),
+                                   6, 60);
+        else
+                res = -1;
+
+        end_dialog(saved_x, saved_y);
+
+        switch (res) {
+        case 0:
+                if (conf_write(filename)) {
+                        fprintf(stderr, _("\n\n"
+                                          "Error while writing of the configuration.\n"
+                                          "Your configuration changes were NOT saved."
+                                          "\n\n"));
+                        return 1;
+                }
+                /* fall through */
+        case -1:
+                printf(_("\n\n"
+                         "*** End of the configuration.\n"
+                         "*** Execute 'make' to start the build or try 'make help'."
+                         "\n\n"));
+                res = 0;
+                break;
+        default:
+                fprintf(stderr, _("\n\n"
+                                  "Your configuration changes were NOT saved."
+                                  "\n\n"));
+        }
+
+        return res;
+}
+
+static void sig_handler(int signo)
+{
+        exit(handle_exit());
+}
+
 int main(int ac, char **av)
 {
-        int saved_x, saved_y;
         char *mode;
         int res;
 
@@ -802,6 +849,8 @@ int main(int ac, char **av)
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
+        signal(SIGINT, sig_handler);
+
         conf_parse(av[1]);
         conf_read(NULL);
 
@@ -823,40 +872,9 @@ int main(int ac, char **av)
         set_config_filename(conf_get_configname());
         do {
                 conf(&rootmenu);
-                dialog_clear();
-                if (conf_get_changed())
-                        res = dialog_yesno(NULL,
-                                           _("Do you wish to save your "
-                                             "new configuration?\n"
-                                             "<ESC><ESC> to continue."),
-                                           6, 60);
-                else
-                        res = -1;
+                res = handle_exit();
         } while (res == KEY_ESC);
-        end_dialog(saved_x, saved_y);
-
-        switch (res) {
-        case 0:
-                if (conf_write(filename)) {
-                        fprintf(stderr, _("\n\n"
-                                "Error while writing of the configuration.\n"
-                                "Your configuration changes were NOT saved."
-                                "\n\n"));
-                        return 1;
-                }
-                /* fall through */
-        case -1:
-                printf(_("\n\n"
-                        "*** End of the configuration.\n"
-                        "*** Execute 'make' to start the build or try 'make help'."
-                        "\n\n"));
-                break;
-        default:
-                fprintf(stderr, _("\n\n"
-                        "Your configuration changes were NOT saved."
-                        "\n\n"));
-        }
 
-        return 0;
+        return res;
 }
 
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index d66008639a43..8c2a97e60faf 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,8 +10,7 @@
 
 #include "lkc.h"
 
-static const char nohelp_text[] = N_(
-        "There is no help available for this option.\n");
+static const char nohelp_text[] = "There is no help available for this option.";
 
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
@@ -595,16 +594,14 @@ struct gstr get_relations_str(struct symbol **sym_arr)
 void menu_get_ext_help(struct menu *menu, struct gstr *help)
 {
         struct symbol *sym = menu->sym;
+        const char *help_text = nohelp_text;
 
         if (menu_has_help(menu)) {
-                if (sym->name) {
+                if (sym->name)
                         str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
-                        str_append(help, _(menu_get_help(menu)));
-                        str_append(help, "\n");
-                }
-        } else {
-                str_append(help, nohelp_text);
+                help_text = menu_get_help(menu);
         }
+        str_printf(help, "%s\n", _(help_text));
         if (sym)
                 get_symbol_str(help, sym);
 }
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 39ca1f1640ea..73070cb0b6de 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -182,8 +182,6 @@ 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"
@@ -280,6 +278,9 @@ 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);
@@ -695,7 +696,6 @@ 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, 99);
+                        "", &dialog_input_result, &dialog_input_result_len);
         switch (dres) {
         case 0:
                 break;
@@ -1348,7 +1348,6 @@ 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;
@@ -1371,8 +1370,8 @@ static void conf_string(struct menu *menu)
                                 prompt ? _(prompt) : _("Main Menu"),
                                 heading,
                                 sym_get_string_value(menu->sym),
-                                dialog_input_result,
-                                sizeof(dialog_input_result));
+                                &dialog_input_result,
+                                &dialog_input_result_len);
                 switch (res) {
                 case 0:
                         if (sym_set_string_value(menu->sym,
@@ -1392,14 +1391,13 @@ 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,
-                                sizeof(dialog_input_result));
+                                &dialog_input_result,
+                                &dialog_input_result_len);
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
@@ -1424,14 +1422,13 @@ 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,
-                                sizeof(dialog_input_result));
+                                &dialog_input_result,
+                                &dialog_input_result_len);
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index f8137b3a5382..3b18dd839668 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -356,7 +356,7 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
 
 int dialog_inputbox(WINDOW *main_window,
                 const char *title, const char *prompt,
-                const char *init, char *result, int result_len)
+                const char *init, char **resultp, int *result_len)
 {
         int prompt_lines = 0;
         int prompt_width = 0;
@@ -367,7 +367,13 @@ int dialog_inputbox(WINDOW *main_window,
         int i, x, y;
         int res = -1;
         int cursor_position = strlen(init);
+        int cursor_form_win;
+        char *result = *resultp;
 
+        if (strlen(init)+1 > *result_len) {
+                *result_len = strlen(init)+1;
+                *resultp = result = realloc(result, *result_len);
+        }
 
         /* find the widest line of msg: */
         prompt_lines = get_line_no(prompt);
@@ -384,7 +390,7 @@ int dialog_inputbox(WINDOW *main_window,
         y = (LINES-(prompt_lines+4))/2;
         x = (COLS-(prompt_width+4))/2;
 
-        strncpy(result, init, result_len);
+        strncpy(result, init, *result_len);
 
         /* create the windows */
         win = newwin(prompt_lines+6, prompt_width+7, y, x);
@@ -405,7 +411,9 @@ int dialog_inputbox(WINDOW *main_window,
         fill_window(prompt_win, prompt);
 
         mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-        mvwprintw(form_win, 0, 0, "%s", result);
+        cursor_form_win = min(cursor_position, prompt_width-1);
+        mvwprintw(form_win, 0, 0, "%s",
+                  result + cursor_position-cursor_form_win);
 
         /* create panels */
         panel = new_panel(win);
@@ -431,6 +439,8 @@ int dialog_inputbox(WINDOW *main_window,
                                                 &result[cursor_position],
                                                 len-cursor_position+1);
                                 cursor_position--;
+                                cursor_form_win--;
+                                len--;
                         }
                         break;
                 case KEY_DC:
@@ -438,38 +448,63 @@ int dialog_inputbox(WINDOW *main_window,
                                 memmove(&result[cursor_position],
                                                 &result[cursor_position+1],
                                                 len-cursor_position+1);
+                                len--;
                         }
                         break;
                 case KEY_UP:
                 case KEY_RIGHT:
-                        if (cursor_position < len &&
-                            cursor_position < min(result_len, prompt_width))
+                        if (cursor_position < len) {
                                 cursor_position++;
+                                cursor_form_win++;
+                        }
                         break;
                 case KEY_DOWN:
                 case KEY_LEFT:
-                        if (cursor_position > 0)
+                        if (cursor_position > 0) {
                                 cursor_position--;
+                                cursor_form_win--;
+                        }
+                        break;
+                case KEY_HOME:
+                        cursor_position = 0;
+                        cursor_form_win = 0;
+                        break;
+                case KEY_END:
+                        cursor_position = len;
+                        cursor_form_win = min(cursor_position, prompt_width-1);
                         break;
                 default:
-                        if ((isgraph(res) || isspace(res)) &&
-                                        len-2 < result_len) {
+                        if ((isgraph(res) || isspace(res))) {
+                                /* one for new char, one for '\0' */
+                                if (len+2 > *result_len) {
+                                        *result_len = len+2;
+                                        *resultp = result = realloc(result,
+                                                                *result_len);
+                                }
                                 /* insert the char at the proper position */
                                 memmove(&result[cursor_position+1],
                                                 &result[cursor_position],
-                                                len+1);
+                                                len-cursor_position+1);
                                 result[cursor_position] = res;
                                 cursor_position++;
+                                cursor_form_win++;
+                                len++;
                         } else {
-                                mvprintw(0, 0, "unknow key: %d\n", res);
+                                mvprintw(0, 0, "unknown key: %d\n", res);
                         }
                         break;
                 }
+                if (cursor_form_win < 0)
+                        cursor_form_win = 0;
+                else if (cursor_form_win > prompt_width-1)
+                        cursor_form_win = prompt_width-1;
+
                 wmove(form_win, 0, 0);
                 wclrtoeol(form_win);
                 mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-                mvwprintw(form_win, 0, 0, "%s", result);
-                wmove(form_win, 0, cursor_position);
+                mvwprintw(form_win, 0, 0, "%s",
+                        result + cursor_position-cursor_form_win);
+                wmove(form_win, 0, cursor_form_win);
                 touchwin(win);
                 refresh_all_windows(main_window);
 
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h
index 58fbda8fc0dc..0d5261705ef5 100644
--- a/scripts/kconfig/nconf.h
+++ b/scripts/kconfig/nconf.h
@@ -89,7 +89,7 @@ void fill_window(WINDOW *win, const char *text);
 int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...);
 int dialog_inputbox(WINDOW *main_window,
                 const char *title, const char *prompt,
-                const char *init, char *result, int result_len);
+                const char *init, char **resultp, int *result_len);
 void refresh_all_windows(WINDOW *main_window);
 void show_scroll_win(WINDOW *main_window,
                 const char *title,
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index a4fe923c0131..ec7afce4c88d 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -43,6 +43,7 @@
 #    make oldconfig
 #
 use strict;
+use Getopt::Long;
 
 my $config = ".config";
 
@@ -112,10 +113,17 @@ sub find_config {
 
 find_config;
 
+# Parse options
+my $localmodconfig = 0;
+my $localyesconfig = 0;
+
+GetOptions("localmodconfig" => \$localmodconfig,
+           "localyesconfig" => \$localyesconfig);
+
 # Get the build source and top level Kconfig file (passed in)
 my $ksource = $ARGV[0];
 my $kconfig = $ARGV[1];
-my $lsmod_file = $ARGV[2];
+my $lsmod_file = $ENV{'LSMOD'};
 
 my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
 chomp @makefiles;
@@ -296,7 +304,11 @@ my %modules;
 
 if (defined($lsmod_file)) {
     if ( ! -f $lsmod_file) {
-        die "$lsmod_file not found";
+        if ( -f $ENV{'objtree'}."/".$lsmod_file) {
+            $lsmod_file = $ENV{'objtree'}."/".$lsmod_file;
+        } else {
+                die "$lsmod_file not found";
+        }
     }
     if ( -x $lsmod_file) {
         # the file is executable, run it
@@ -421,7 +433,11 @@ while(<CIN>) {
 
     if (/^(CONFIG.*)=(m|y)/) {
         if (defined($configs{$1})) {
-            $setconfigs{$1} = $2;
+            if ($localyesconfig) {
+                $setconfigs{$1} = 'y';
+            } else {
+                $setconfigs{$1} = $2;
+            }
         } elsif ($2 eq "m") {
             print "# $1 is not set\n";
             next;