Fix kbuild bugs noticed by Bernhard Fischer <rep.nop@aon.at>

diff --git a/networking/Config.in b/networking/Config.in
index f9ea5648840d6ed8f8c68b24d53e3c99af7c3f73..3dfd80b3da31ef1da3317509cc6c6fc71d1fca40 100644 (file)
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -53,7 +53,7 @@ config FTPPUT
 config FEATURE_FTPGETPUT_LONG_OPTIONS
        bool "Enable long options in ftpget/ftpput"
        default n
-       depends on GETOPT_LONG && (CONFIG_FTPGET || FTPPUT)
+       depends on GETOPT_LONG && (FTPGET || FTPPUT)
        help
          Support long options for the ftpget/ftpput applet.
 
@@ -239,20 +239,20 @@ config FEATURE_IFUPDOWN_IP_BUILTIN
        help
          Use the busybox iproute "ip" applet to implement "ifupdown".
 
-         If leave this disabled, you must install the full-blown iproute2
+         If left disabled, you must install the full-blown iproute2
          utility or the  "ifup" and "ifdown" applets will not work.
 
-config FEATURE_IFUPDOWN_IP_BUILTIN
+config FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
        bool "Use busybox ifconfig and route applets"
        default y
-       depends on IFUPDOWN && !CONFIG_FEATURE_IFUPDOWN_IP
+       depends on IFUPDOWN && !FEATURE_IFUPDOWN_IP
        select IFCONFIG
        select ROUTE
        help
          Use the busybox iproute "ifconfig" and "route" applets to
          implement the "ifup" and "ifdown" utilities.
 
-         If leave this disabled, you must install the full-blown ifconfig
+         If left disabled, you must install the full-blown ifconfig
          and route utilities, or the  "ifup" and "ifdown" applets will not
          work.
 

diff --git a/shell/Config.in b/shell/Config.in
index 0e25bedcbb9e325df6a7c6cb632e849c6080d246..9ac2331556f4990d709a829724782d578f197276 100644 (file)
--- a/shell/Config.in
+++ b/shell/Config.in
@@ -257,6 +257,7 @@ config FEATURE_COMMAND_EDITING_VI
 
 config FEATURE_COMMAND_HISTORY
        int "History size"
+       range 0 99999
        default 15
        depends on FEATURE_COMMAND_EDITING
        help

diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 35a8d5e273c1261270b3822f979f7f34076fc435..dda6f69584084cd5e491ff97c25627872dafe3b1 100644 (file)
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -83,12 +83,10 @@
 #ifndef CONFIG_FEATURE_COMMAND_HISTORY
 #define MAX_HISTORY   15
 #else
-#define MAX_HISTORY   CONFIG_FEATURE_COMMAND_HISTORY
+#define MAX_HISTORY   (CONFIG_FEATURE_COMMAND_HISTORY + 0)
 #endif
 
-#if MAX_HISTORY < 1
-#warning cmdedit: You set MAX_HISTORY < 1. The history algorithm switched off.
-#else
+#if MAX_HISTORY > 0
 static char *history[MAX_HISTORY+1]; /* history + current */
 /* saved history lines */
 static int n_history;
@@ -1166,7 +1164,7 @@ static void input_tab(int *lastWasTab)
 }
 #endif  /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */
 
-#if MAX_HISTORY >= 1
+#if MAX_HISTORY > 0
 static void get_previous_history(void)
 {
        if(command_ps[0] != 0 || history[cur_history] == 0) {
@@ -1529,7 +1527,7 @@ prepare_to_die:
                        printf("\033[H");
                        redraw(0, len-cursor);
                        break;
-#if MAX_HISTORY >= 1
+#if MAX_HISTORY > 0
                case CNTRL('N'):
                vi_case( case CNTRL('N')|vbit: )
                vi_case( case 'j'|vbit: )
@@ -1730,7 +1728,7 @@ prepare_to_die:
                                input_tab(&lastWasTab);
                                break;
 #endif
-#if MAX_HISTORY >= 1
+#if MAX_HISTORY > 0
                        case 'A':
                                /* Up Arrow -- Get previous command from history */
                                if (cur_history > 0) {
@@ -1838,7 +1836,7 @@ rewrite_line:
        setTermSettings(0, (void *) &initial_settings);
        handlers_sets &= ~SET_RESET_TERM;
 
-#if MAX_HISTORY >= 1
+#if MAX_HISTORY > 0
        /* Handle command history log */
        /* cleanup may be saved current command line */
        if (len> 0) {                                      /* no put empty line */
@@ -1859,13 +1857,13 @@ rewrite_line:
                num_ok_lines++;
 #endif
        }
-#else  /* MAX_HISTORY < 1 */
+#else  /* MAX_HISTORY == 0 */
 #if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
        if (len > 0) {              /* no put empty line */
                num_ok_lines++;
        }
 #endif
-#endif  /* MAX_HISTORY >= 1 */
+#endif  /* MAX_HISTORY > 0 */
        if (break_out > 0) {
                command[len++] = '\n';          /* set '\n' */
                command[len] = 0;