From 0c6fb98d013e4ffc664935a51adce94254d10f83 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 27 Nov 2009 19:33:20 +0100 Subject: update busybox and default config --- package/busybox/config/shell/Config.in | 113 ++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 44 deletions(-) (limited to 'package/busybox/config/shell') diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 459bbc62b..82718cd1a 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -24,9 +24,9 @@ config BUSYBOX_FEATURE_SH_IS_HUSH #### select LASH #### bool "lash" -config BUSYBOX_FEATURE_SH_IS_MSH - select BUSYBOX_MSH - bool "msh" +####config FEATURE_SH_IS_MSH +#### select MSH +#### bool "msh" config BUSYBOX_FEATURE_SH_IS_NONE bool "none" @@ -43,9 +43,6 @@ config BUSYBOX_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_ASH - config BUSYBOX_ASH_BASH_COMPAT bool "bash-compatible extensions" default y @@ -84,22 +81,6 @@ config BUSYBOX_ASH_ALIAS help Enable alias support in the ash shell. -config BUSYBOX_ASH_MATH_SUPPORT - bool "Posix math support" - default y - depends on BUSYBOX_ASH - help - Enable math support in the ash shell. - -config BUSYBOX_ASH_MATH_SUPPORT_64 - bool "Extend Posix math support to 64 bit" - default n - depends on BUSYBOX_ASH_MATH_SUPPORT - help - Enable 64-bit math support in the ash shell. This will make - the shell slightly larger, but will allow computation with very - large numbers. - config BUSYBOX_ASH_GETOPTS bool "Builtin getopt to parse positional parameters" default y @@ -152,14 +133,14 @@ config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE Compile ash for reduced size at the price of speed. config BUSYBOX_ASH_RANDOM_SUPPORT - bool "Pseudorandom generator and variable $RANDOM" + bool "Pseudorandom generator and $RANDOM variable" default n depends on BUSYBOX_ASH help Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. You can reset the generator by using a specified start value. - After "unset RANDOM" then generator will switch off and this + After "unset RANDOM" the generator will switch off and this variable will no longer have special treatment. config BUSYBOX_ASH_EXPAND_PRMT @@ -167,7 +148,7 @@ config BUSYBOX_ASH_EXPAND_PRMT default n depends on BUSYBOX_ASH help - "PS#" may be contain volatile content, such as backquote commands. + "PS#" may contain volatile content, such as backquote commands. This option recreates the prompt string from the environment variable each time it is displayed. @@ -175,16 +156,22 @@ config BUSYBOX_HUSH bool "hush" default n help - hush is a very small shell (just 18k) and it has fairly complete - Bourne shell grammar. It even handles all the normal flow control - options such as if/then/elif/else/fi, for/in/do/done, while loops, - case/esac. + hush is a small shell (22k). It handles the normal flow control + constructs such as if/then/elif/else/fi, for/in/do/done, while loops, + case/esac. Redirections, here documents, $((arithmetic)) + and functions are supported. - It uses only vfork, so it can be used on uClinux systems. + It will compile and work on no-mmu systems. - It does not handle select, functions, here documents ( << - word ), arithmetic expansion, aliases, brace expansion, tilde - expansion, &> and >& redirection of stdout+stderr, etc. + It does not handle select, aliases, brace expansion, + tilde expansion, &>file and >&file redirection of stdout+stderr. + +config BUSYBOX_HUSH_BASH_COMPAT + bool "bash-compatible extensions" + default y + depends on BUSYBOX_HUSH + help + Enable bash-compatible extensions. config BUSYBOX_HUSH_HELP bool "help builtin" @@ -234,7 +221,6 @@ config BUSYBOX_HUSH_LOOPS depends on BUSYBOX_HUSH help Enable for, while and until loops in hush. - As of 2008-07, break and continue statements are not supported. config BUSYBOX_HUSH_CASE bool "Support case ... esac statement" @@ -243,26 +229,65 @@ config BUSYBOX_HUSH_CASE help Enable case ... esac statement in hush. +400 bytes. +config BUSYBOX_HUSH_FUNCTIONS + bool "Support funcname() { commands; } syntax" + default n + depends on BUSYBOX_HUSH + help + Enable support for shell functions in hush. +800 bytes. + +config BUSYBOX_HUSH_LOCAL + bool "Support local builtin" + default n + depends on BUSYBOX_HUSH_FUNCTIONS + help + Enable support for local variables in functions. + +config BUSYBOX_HUSH_EXPORT_N + bool "Support export '-n' option" + default n + depends on BUSYBOX_HUSH + help + Enable support for export '-n' option in hush. It is a bash extension. + config BUSYBOX_LASH - bool "lash" + bool "lash (deprecated: aliased to hush)" default n select BUSYBOX_HUSH help lash is deprecated and will be removed, please migrate to hush. config BUSYBOX_MSH - bool "msh" + bool "msh (deprecated: please use hush)" default n + select BUSYBOX_HUSH help - The minix shell (adds just 30k) is quite complete and handles things - like for/do/done, case/esac and all the things you expect a Bourne - shell to do. It is not always pedantically correct about Bourne - shell grammar (try running the shell testscript "tests/sh.testcases" - on it and compare vs bash) but for most things it works quite well. - It uses only vfork, so it can be used on uClinux systems. + 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. -comment "Bourne Shell Options" - depends on BUSYBOX_MSH || BUSYBOX_LASH || BUSYBOX_HUSH || BUSYBOX_ASH +# The minix shell (adds just 30k) is quite complete and handles things +# like for/do/done, case/esac and all the things you expect a Bourne +# shell to do. It is not always pedantically correct about Bourne +# shell grammar (try running the shell testscript "tests/sh.testcases" +# on it and compare vs bash) but for most things it works quite well. +# It uses only vfork, so it can be used on uClinux systems. + + +config BUSYBOX_SH_MATH_SUPPORT + bool "POSIX math support" + default y + depends on BUSYBOX_ASH || BUSYBOX_HUSH + help + Enable math support in the shell via $((...)) syntax. + +config BUSYBOX_SH_MATH_SUPPORT_64 + bool "Extend POSIX math support to 64 bit" + default n + depends on BUSYBOX_SH_MATH_SUPPORT + help + Enable 64-bit math support in the shell. This will make the shell + slightly larger, but will allow computation with very large numbers. + This is not in POSIX, so do not rely on this in portable code. config BUSYBOX_FEATURE_SH_EXTRA_QUIET bool "Hide message on interactive shell startup" -- cgit v1.2.3