revert parts of r27488 to uboot-lantiq

[openwrt.git] / package / busybox / config / libbb / Config.in

diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in
index 8016ef0..a3c9641 100644 (file)
--- a/package/busybox/config/libbb/Config.in
+++ b/package/busybox/config/libbb/Config.in
@@ -41,6 +41,17 @@ config BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS
          a rarely used feature which allows you to use names
          instead of IP/mask pairs in route command.
 
+config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS
+       bool "Use termios to manipulate the screen"
+       default n
+       depends on BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TOP || BUSYBOX_CONFIG_POWERTOP
+       help
+         This option allows utilities such as 'more' and 'top' to determine
+         the size of the screen. If you leave this disabled, your utilities
+         that display things on the screen will be especially primitive and
+         will be unable to determine the current screen size, and will be
+         unable to move the cursor.
+
 config BUSYBOX_CONFIG_FEATURE_EDITING
        bool "Command line editing"
        default y
@@ -76,9 +87,9 @@ config BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY
 config BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY
        bool "History saving"
        default n
-       depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_EDITING
+       depends on BUSYBOX_CONFIG_FEATURE_EDITING
        help
-         Enable history saving in ash shell.
+         Enable history saving in shells.
 
 config BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION
        bool "Tab completion"
@@ -111,7 +122,7 @@ config BUSYBOX_CONFIG_FEATURE_EDITING_ASK_TERMINAL
          current cursor position. This information is used to make line
          editing more robust in some cases.
          If you are not sure whether your terminals respond to this code
-         correctly, or want to save on code size (about 300 bytes),
+         correctly, or want to save on code size (about 400 bytes),
          then do not turn this option on.
 
 config BUSYBOX_CONFIG_FEATURE_NON_POSIX_CP
@@ -134,9 +145,8 @@ config BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE
            $ cp file /vmlinuz/file
            cp: cannot stat '/vmlinuz/file': Path has non-directory component
          If this feature is not enabled, they will be, respectively:
-           cp: cannot remove '/does_not_exist/file': No such file or directory
+           cp: cannot create '/does_not_exist/file': No such file or directory
            cp: cannot stat '/vmlinuz/file': Not a directory
-         respectively.
          This will cost you ~60 bytes.
 
 config BUSYBOX_CONFIG_FEATURE_COPYBUF_KB
@@ -152,6 +162,7 @@ config BUSYBOX_CONFIG_FEATURE_COPYBUF_KB
 config BUSYBOX_CONFIG_MONOTONIC_SYSCALL
        bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
          time intervals (time, ping, traceroute etc need this).