Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox

[oweals/busybox.git] / shell / Config.in

diff --git a/shell/Config.in b/shell/Config.in
index bc911c1e296aed881ac8ab90dbaf50d972a40370..57969f02cdf00f054573a2508ac64becdcb78264 100644 (file)
--- a/shell/Config.in
+++ b/shell/Config.in
@@ -84,22 +84,6 @@ config ASH_ALIAS
        help
          Enable alias support in the ash shell.
 
        help
          Enable alias support in the ash shell.
 

-config ASH_MATH_SUPPORT
-       bool "Posix math support"
-       default y
-       depends on ASH
-       help
-         Enable math support in the ash shell.
-
-config ASH_MATH_SUPPORT_64
-       bool "Extend Posix math support to 64 bit"
-       default n
-       depends on 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 ASH_GETOPTS
        bool "Builtin getopt to parse positional parameters"
        default n
 config ASH_GETOPTS
        bool "Builtin getopt to parse positional parameters"
        default n


@@ -152,14 +136,14 @@ config ASH_OPTIMIZE_FOR_SIZE
          Compile ash for reduced size at the price of speed.
 
 config ASH_RANDOM_SUPPORT
          Compile ash for reduced size at the price of speed.
 
 config ASH_RANDOM_SUPPORT

-       bool "Pseudorandom generator and variable $RANDOM"
+       bool "Pseudorandom generator and $RANDOM variable"

        default n
        depends on 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.
        default n
        depends on 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 ASH_EXPAND_PRMT
          variable will no longer have special treatment.
 
 config ASH_EXPAND_PRMT


@@ -167,7 +151,7 @@ config ASH_EXPAND_PRMT
        default n
        depends on ASH
        help
        default n
        depends on 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.
 
          This option recreates the prompt string from the environment
          variable each time it is displayed.
 


@@ -175,16 +159,15 @@ config HUSH
        bool "hush"
        default n
        help
        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 HUSH_HELP
        bool "help builtin"
 
 config HUSH_HELP
        bool "help builtin"


@@ -234,7 +217,6 @@ config HUSH_LOOPS
        depends on HUSH
        help
          Enable for, while and until loops in hush.
        depends on HUSH
        help
          Enable for, while and until loops in hush.

-         As of 2008-07, break and continue statements are not supported.

 
 config HUSH_CASE
        bool "Support case ... esac statement"
 
 config HUSH_CASE
        bool "Support case ... esac statement"


@@ -243,6 +225,20 @@ config HUSH_CASE
        help
          Enable case ... esac statement in hush. +400 bytes.
 
        help
          Enable case ... esac statement in hush. +400 bytes.
 

+config HUSH_FUNCTIONS
+       bool "Support funcname() { commands; } syntax"
+       default n
+       depends on HUSH
+       help
+         Enable support for shell functions in hush. +800 bytes.
+
+config HUSH_EXPORT_N
+       bool "Support export '-n' option"
+       default n
+       depends on HUSH
+       help
+         Enable support for export '-n' option in hush. It is a bash extension.
+

 config LASH
        bool "lash (deprecated: aliased to hush)"
        default n
 config LASH
        bool "lash (deprecated: aliased to hush)"
        default n


@@ -251,19 +247,39 @@ config LASH
          lash is deprecated and will be removed, please migrate to hush.
 
 config MSH
          lash is deprecated and will be removed, please migrate to hush.
 
 config MSH

-       bool "msh"
+       bool "msh (deprecated: please use hush)"

        default n
        help
        default n
        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.
+
+#        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.
+

 
 comment "Bourne Shell Options"
        depends on MSH || LASH || HUSH || ASH
 
 
 comment "Bourne Shell Options"
        depends on MSH || LASH || HUSH || ASH
 

+config SH_MATH_SUPPORT
+       bool "POSIX math support"
+       default y
+       depends on ASH || HUSH
+       help
+         Enable math support in the shell via $((...)) syntax.
+
+config SH_MATH_SUPPORT_64
+       bool "Extend POSIX math support to 64 bit"
+       default n
+       depends on 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 FEATURE_SH_EXTRA_QUIET
        bool "Hide message on interactive shell startup"
        default n
 config FEATURE_SH_EXTRA_QUIET
        bool "Hide message on interactive shell startup"
        default n