Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge

Conflicts:
	coreutils/ls.c
	include/platform.h
	libbb/bb_basename.c

4 files changed, 10 insertions, 15 deletions

diff --git a/scripts/defconfig.tig b/scripts/defconfig.tig
index ab9dc4728..e19217f08 100644
--- a/scripts/defconfig.tig
+++ b/scripts/defconfig.tig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.19.0.git
-# Thu Mar 22 14:00:24 2012
+# Thu Mar 22 15:00:34 2012
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -615,11 +615,13 @@ CONFIG_HD=y
 # CONFIG_CONSPY is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
 # CONFIG_UBIMKVOL is not set
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 # CONFIG_ADJTIMEX is not set
 CONFIG_BBCONFIG=y
 CONFIG_FEATURE_COMPRESS_BBCONFIG=y
@@ -826,6 +828,7 @@ CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 6e097889f..ea2446a89 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -173,7 +173,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
 int conf_string(struct menu *menu)
 {
         struct symbol *sym = menu->sym;
-        const char *def, *help;
+        const char *def;
 
         while (1) {
                 printf("%*s%s ", indent - 1, "", menu->prompt->text);
@@ -188,10 +188,7 @@ int conf_string(struct menu *menu)
                 case '?':
                         /* print help */
                         if (line[1] == '\n') {
-                                help = nohelp_text;
-                                if (menu->sym->help)
-                                        help = menu->sym->help;
-                                printf("\n%s\n", menu->sym->help);
+                                printf("\n%s\n", menu->sym->help ? menu->sym->help : nohelp_text);
                                 def = NULL;
                                 break;
                         }
@@ -207,7 +204,6 @@ int conf_string(struct menu *menu)
 static int conf_sym(struct menu *menu)
 {
         struct symbol *sym = menu->sym;
-        int type;
         tristate oldval, newval;
         const char *help;
 
@@ -215,7 +211,6 @@ static int conf_sym(struct menu *menu)
                 printf("%*s%s ", indent - 1, "", menu->prompt->text);
                 if (sym->name)
                         printf("(%s) ", sym->name);
-                type = sym_get_type(sym);
                 putchar('[');
                 oldval = sym_get_tristate_value(sym);
                 switch (oldval) {
@@ -282,11 +277,9 @@ static int conf_choice(struct menu *menu)
 {
         struct symbol *sym, *def_sym;
         struct menu *child;
-        int type;
         bool is_new;
 
         sym = menu->sym;
-        type = sym_get_type(sym);
         is_new = !sym_has_value(sym);
         if (sym_is_changable(sym)) {
                 conf_sym(menu);
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 77848bb8e..de4ae41d7 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -38,11 +38,8 @@ int dialog_textbox(const char *title, const char *file, int height, int width)
 {
         int i, x, y, cur_x, cur_y, fpos, key = 0;
         int passed_end;
-        char search_term[MAX_LEN + 1];
         WINDOW *dialog, *text;
 
-        search_term[0] = '\0';  /* no search term entered yet */
-
         /* Open input file for reading */
         if ((fd = open(file, O_RDONLY)) == -1) {
                 endwin();
@@ -437,7 +434,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();
@@ -446,11 +442,13 @@ 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 i;
+                int y, x;
+
+                getyx(win, y, x);
                 for (i = 0; i < width - x; i++)
                         waddch(win, ' ');
         }
diff --git a/scripts/trylink b/scripts/trylink
index 5994a757b..a8b0b2e03 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -255,6 +255,7 @@ if test "$CONFIG_FEATURE_SHARED_BUSYBOX" = y; then
             $GC_SECTIONS \
             $START_GROUP $O_FILES $END_GROUP \
             -L"$sharedlib_dir" -lbusybox \
+            $l_list \
             $INFO_OPTS \
     || {
         echo "Linking $EXE failed"