X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9dfc3e34ee54d00b68cc4cbb5cddcfa588fd07fb..12a6034cab464bf63079909b7a9d4da0a34820f9:/package/busybox/config/shell/Config.in

diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 233c3a8f4..5d492e239 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -15,6 +15,7 @@ choice
 config BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
 	select BUSYBOX_CONFIG_ASH
 	bool "ash"
+	depends on !BUSYBOX_CONFIG_NOMMU
 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
 	select BUSYBOX_CONFIG_HUSH
@@ -24,9 +25,9 @@ config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
 ####	select LASH
 ####	bool "lash"
 
-config BUSYBOX_CONFIG_FEATURE_SH_IS_MSH
-	select BUSYBOX_CONFIG_MSH
-	bool "msh"
+####config FEATURE_SH_IS_MSH
+####	select MSH
+####	bool "msh"
 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_NONE
 	bool "none"
@@ -36,6 +37,7 @@ endchoice
 config BUSYBOX_CONFIG_ASH
 	bool "ash"
 	default y
+	depends on !BUSYBOX_CONFIG_NOMMU
 	help
 	  Tha 'ash' shell adds about 60k in the default configuration and is
 	  the most complete and most pedantically correct shell included with
@@ -43,9 +45,6 @@ config BUSYBOX_CONFIG_ASH
 	  shell (by Herbert Xu), which was created by porting the 'ash' shell
 	  (written by Kenneth Almquist) from NetBSD.
 
-comment "Ash Shell Options"
-	depends on BUSYBOX_CONFIG_ASH
-
 config BUSYBOX_CONFIG_ASH_BASH_COMPAT
 	bool "bash-compatible extensions"
 	default y
@@ -60,23 +59,6 @@ config BUSYBOX_CONFIG_ASH_JOB_CONTROL
 	help
 	  Enable job control in the ash shell.
 
-config BUSYBOX_CONFIG_ASH_READ_NCHARS
-	bool "'read -n N' and 'read -s' support"
-	default n
-	depends on BUSYBOX_CONFIG_ASH
-	help
-	  'read -n N' will return a value after N characters have been read.
-	  'read -s' will read without echoing the user's input.
-
-config BUSYBOX_CONFIG_ASH_READ_TIMEOUT
-	bool "'read -t S' support"
-	default y
-	depends on BUSYBOX_CONFIG_ASH
-	help
-	  'read -t S' will return a value after S seconds have passed.
-	  This implementation will allow fractional seconds, expressed
-	  as a decimal fraction, e.g. 'read -t 2.5 foo'.
-
 config BUSYBOX_CONFIG_ASH_ALIAS
 	bool "alias support"
 	default y
@@ -169,26 +151,33 @@ config BUSYBOX_CONFIG_HUSH
 	  It does not handle select, aliases, brace expansion,
 	  tilde expansion, &>file and >&file redirection of stdout+stderr.
 
+config BUSYBOX_CONFIG_HUSH_BASH_COMPAT
+	bool "bash-compatible extensions"
+	default y
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable bash-compatible extensions.
+
 config BUSYBOX_CONFIG_HUSH_HELP
 	bool "help builtin"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable help builtin in hush. Code size + ~1 kbyte.
 
 config BUSYBOX_CONFIG_HUSH_INTERACTIVE
 	bool "Interactive mode"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable interactive mode (prompt and command editing).
 	  Without this, hush simply reads and executes commands
-	  from stdin just like a shell script from the file.
+	  from stdin just like a shell script from a file.
 	  No prompt, no PS1/PS2 magic shell variables.
 
 config BUSYBOX_CONFIG_HUSH_JOB
 	bool "Job control"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH_INTERACTIVE
 	help
 	  Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
@@ -199,39 +188,61 @@ config BUSYBOX_CONFIG_HUSH_JOB
 
 config BUSYBOX_CONFIG_HUSH_TICK
 	bool "Process substitution"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable process substitution `command` and $(command) in hush.
 
 config BUSYBOX_CONFIG_HUSH_IF
 	bool "Support if/then/elif/else/fi"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable if/then/elif/else/fi in hush.
 
 config BUSYBOX_CONFIG_HUSH_LOOPS
 	bool "Support for, while and until loops"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable for, while and until loops in hush.
 
 config BUSYBOX_CONFIG_HUSH_CASE
 	bool "Support case ... esac statement"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable case ... esac statement in hush. +400 bytes.
 
 config BUSYBOX_CONFIG_HUSH_FUNCTIONS
 	bool "Support funcname() { commands; } syntax"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable support for shell functions in hush. +800 bytes.
 
+config BUSYBOX_CONFIG_HUSH_LOCAL
+	bool "Support local builtin"
+	default y
+	depends on BUSYBOX_CONFIG_HUSH_FUNCTIONS
+	help
+	  Enable support for local variables in functions.
+
+config BUSYBOX_CONFIG_HUSH_EXPORT_N
+	bool "Support export '-n' option"
+	default y
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable support for export '-n' option in hush. It is a bash extension.
+
+config BUSYBOX_CONFIG_HUSH_RANDOM_SUPPORT
+	bool "Pseudorandom generator and $RANDOM variable"
+	default n
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable pseudorandom generator and dynamic variable "$RANDOM".
+	  Each read of "$RANDOM" will generate a new pseudorandom value.
+
 config BUSYBOX_CONFIG_LASH
 	bool "lash (deprecated: aliased to hush)"
 	default n
@@ -242,6 +253,7 @@ config BUSYBOX_CONFIG_LASH
 config BUSYBOX_CONFIG_MSH
 	bool "msh (deprecated: please use hush)"
 	default n
+	select BUSYBOX_CONFIG_HUSH
 	help
 	  msh is deprecated and will be removed, please migrate to hush.
 	  If there is a feature msh has but hush does not, please let us know.
@@ -254,9 +266,6 @@ config BUSYBOX_CONFIG_MSH
 #	  It uses only vfork, so it can be used on uClinux systems.
 
 
-comment "Bourne Shell Options"
-	depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
-
 config BUSYBOX_CONFIG_SH_MATH_SUPPORT
 	bool "POSIX math support"
 	default y