Merge branch 'origin/master' (early part)

3 files changed, 60 insertions, 52 deletions

diff --git a/shell/Config.src b/shell/Config.src
index 234d05367..800911966 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -5,57 +5,7 @@
 
 menu "Shells"
 
-choice
-        prompt "Choose which shell is aliased to 'sh' name"
-        default FEATURE_SH_IS_ASH
-        help
-          Choose which shell you want to be executed by 'sh' alias.
-          The ash shell is the most bash compatible and full featured one.
-
-config FEATURE_SH_IS_ASH
-        select ASH
-        bool "ash"
-        depends on !NOMMU
-
-config FEATURE_SH_IS_HUSH
-        select HUSH
-        bool "hush"
-
-config FEATURE_SH_IS_NONE
-        bool "none"
-
-endchoice
-
-choice
-        prompt "Choose which shell is aliased to 'bash' name"
-        default FEATURE_BASH_IS_NONE
-        help
-          Choose which shell you want to be executed by 'bash' alias.
-          The ash shell is the most bash compatible and full featured one.
-
-          Note that selecting this option does not switch on any bash
-          compatibility code. It merely makes it possible to install
-          /bin/bash (sym)link and run scripts which start with
-          #!/bin/bash line.
-
-          Many systems use it in scripts which use bash-specific features,
-          even simple ones like $RANDOM. Without this option, busybox
-          can't be used for running them because it won't recongnize
-          "bash" as a supported applet name.
-
-config FEATURE_BASH_IS_ASH
-        select ASH
-        bool "ash"
-        depends on !NOMMU
-
-config FEATURE_BASH_IS_HUSH
-        select HUSH
-        bool "hush"
-
-config FEATURE_BASH_IS_NONE
-        bool "none"
-
-endchoice
+INSERT
 
 config ASH
         bool "ash"
@@ -266,6 +216,61 @@ config HUSH_RANDOM_SUPPORT
           Enable pseudorandom generator and dynamic variable "$RANDOM".
           Each read of "$RANDOM" will generate a new pseudorandom value.
 
+
+choice
+        prompt "Choose which shell is aliased to 'sh' name"
+        default FEATURE_SH_IS_ASH
+        help
+          Choose which shell you want to be executed by 'sh' alias.
+          The ash shell is the most bash compatible and full featured one.
+
+# note: cannot use "select ASH" here, it breaks "make allnoconfig"
+config FEATURE_SH_IS_ASH
+        depends on ASH
+        bool "ash"
+        depends on !NOMMU
+
+config FEATURE_SH_IS_HUSH
+        depends on HUSH
+        bool "hush"
+
+config FEATURE_SH_IS_NONE
+        bool "none"
+
+endchoice
+
+choice
+        prompt "Choose which shell is aliased to 'bash' name"
+        default FEATURE_BASH_IS_NONE
+        help
+          Choose which shell you want to be executed by 'bash' alias.
+          The ash shell is the most bash compatible and full featured one.
+
+          Note that selecting this option does not switch on any bash
+          compatibility code. It merely makes it possible to install
+          /bin/bash (sym)link and run scripts which start with
+          #!/bin/bash line.
+
+          Many systems use it in scripts which use bash-specific features,
+          even simple ones like $RANDOM. Without this option, busybox
+          can't be used for running them because it won't recongnize
+          "bash" as a supported applet name.
+
+config FEATURE_BASH_IS_ASH
+        depends on ASH
+        bool "ash"
+        depends on !NOMMU
+
+config FEATURE_BASH_IS_HUSH
+        depends on HUSH
+        bool "hush"
+
+config FEATURE_BASH_IS_NONE
+        bool "none"
+
+endchoice
+
+
 config LASH
         bool "lash (deprecated: aliased to hush)"
         default n
diff --git a/shell/Kbuild.src b/shell/Kbuild.src
index 8bdb68b11..d76b35386 100644
--- a/shell/Kbuild.src
+++ b/shell/Kbuild.src
@@ -5,6 +5,9 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
+
 lib-$(CONFIG_ASH)      += ash.o ash_ptr_hack.o shell_common.o
 lib-$(CONFIG_HUSH)     += hush.o match.o shell_common.o
 lib-$(CONFIG_CTTYHACK) += cttyhack.o
diff --git a/shell/hush.c b/shell/hush.c
index 4cccf31a4..4832e2c48 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7103,7 +7103,7 @@ int hush_main(int argc, char **argv)
                         break;
 #if !BB_MMU
                 case '<': /* "big heredoc" support */
-                        full_write(STDOUT_FILENO, optarg, strlen(optarg));
+                        full_write1_str(optarg);
                         _exit(0);
                 case '$': {
                         unsigned long long empty_trap_mask;