Merge branch 'busybox' into merge

6 files changed, 72 insertions, 5 deletions

diff --git a/shell/Config.src b/shell/Config.src
index 7f5f67050..3545f05dd 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -17,9 +17,19 @@ choice
 config SH_IS_ASH
         depends on !NOMMU
         bool "ash"
+        help
+          Choose ash to be the shell executed by 'sh' name.
+          The ash code will be built into busybox. If you don't select
+          "ash" choice (CONFIG_ASH), this shell may only be invoked by
+          the name 'sh' (and not 'ash').
 
 config SH_IS_HUSH
         bool "hush"
+        help
+          Choose hush to be the shell executed by 'sh' name.
+          The hush code will be built into busybox. If you don't select
+          "hush" choice (CONFIG_HUSH), this shell may only be invoked by
+          the name 'sh' (and not 'hush').
 
 config SH_IS_NONE
         bool "none"
@@ -31,7 +41,8 @@ choice
         default 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.
+          The ash shell is the most bash compatible and full featured one,
+          although compatibility is far from being complete.
 
           Note that selecting this option does not switch on any bash
           compatibility code. It merely makes it possible to install
@@ -46,9 +57,19 @@ choice
 config BASH_IS_ASH
         depends on !NOMMU
         bool "ash"
+        help
+          Choose ash to be the shell executed by 'bash' name.
+          The ash code will be built into busybox. If you don't select
+          "ash" choice (CONFIG_ASH), this shell may only be invoked by
+          the name 'bash' (and not 'ash').
 
 config BASH_IS_HUSH
         bool "hush"
+        help
+          Choose hush to be the shell executed by 'bash' name.
+          The hush code will be built into busybox. If you don't select
+          "hush" choice (CONFIG_HUSH), this shell may only be invoked by
+          the name 'bash' (and not 'hush').
 
 config BASH_IS_NONE
         bool "none"
@@ -59,6 +80,9 @@ endchoice
 INSERT
 
 
+comment "Options common to all shells"
+if ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
+
 config FEATURE_SH_MATH
         bool "POSIX math support"
         default y
@@ -142,5 +166,6 @@ config FEATURE_SH_HISTFILESIZE
           to set shell history size. Note that its max value is capped
           by "History size" setting in library tuning section.
 
+endif # Options common to all shells
 
 endmenu
diff --git a/shell/ash.c b/shell/ash.c
index 35618937a..fe185f5d9 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -41,6 +41,11 @@
 //config:         shell (by Herbert Xu), which was created by porting the 'ash' shell
 //config:         (written by Kenneth Almquist) from NetBSD.
 //config:
+//config:# ash options
+//config:# note: Don't remove !NOMMU part in the next line; it would break
+//config:# menuconfig's indenting.
+//config:if !NOMMU && (ASH || SH_IS_ASH || BASH_IS_ASH)
+//config:
 //config:config ASH_OPTIMIZE_FOR_SIZE
 //config:       bool "Optimize for size instead of speed"
 //config:       default y
@@ -155,6 +160,8 @@
 //config:       depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:       help
 //config:         Enable "check for new mail" function in the ash shell.
+//config:
+//config:endif # ash options
 
 //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
 //applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
@@ -5778,11 +5785,11 @@ redirect(union node *redir, int flags)
                         /* Careful to not accidentally "save"
                          * to the same fd as right side fd in N>&M */
                         int minfd = right_fd < 10 ? 10 : right_fd + 1;
+#if defined(F_DUPFD_CLOEXEC)
+                        i = fcntl(fd, F_DUPFD_CLOEXEC, minfd);
+#else
                         i = fcntl(fd, F_DUPFD, minfd);
-/* You'd expect copy to be CLOEXECed. Currently these extra "saved" fds
- * are closed in popredir() in the child, preventing them from leaking
- * into child. (popredir() also cleans up the mess in case of failures)
- */
+#endif
                         if (i == -1) {
                                 i = errno;
                                 if (i != EBADF) {
@@ -5797,6 +5804,9 @@ redirect(union node *redir, int flags)
  remember_to_close:
                                 i = CLOSED;
                         } else { /* fd is open, save its copy */
+#if !defined(F_DUPFD_CLOEXEC)
+                                fcntl(i, F_SETFD, FD_CLOEXEC);
+#endif
                                 /* "exec fd>&-" should not close fds
                                  * which point to script file(s).
                                  * Force them to be restored afterwards */
diff --git a/shell/ash_test/ash-redir/redir_leak.right b/shell/ash_test/ash-redir/redir_leak.right
new file mode 100644
index 000000000..b1c48292b
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_leak.right
@@ -0,0 +1,6 @@
+4
+4
+4
+4
+4
+4
diff --git a/shell/ash_test/ash-redir/redir_leak.tests b/shell/ash_test/ash-redir/redir_leak.tests
new file mode 100755
index 000000000..c8a9c6343
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_leak.tests
@@ -0,0 +1,10 @@
+# Each of these should show only four lines:
+# fds 0,1,2 are stdio; fd 3 is open by opendir() in ls.
+# This test detects bugs where redirects leave stray open fds.
+
+ls -1 /proc/self/fd | wc -l
+ls -1 /proc/self/fd >/proc/self/fd/1 | wc -l
+ls -1 /proc/self/fd >/proc/self/fd/1 2>&1 | wc -l
+echo "`ls -1 /proc/self/fd `" | wc -l
+echo "`ls -1 /proc/self/fd >/proc/self/fd/1 `" | wc -l
+echo "`ls -1 /proc/self/fd >/proc/self/fd/1 2>&1 `" | wc -l
diff --git a/shell/hush_test/hush-redir/redir_leak.right b/shell/hush_test/hush-redir/redir_leak.right
new file mode 100644
index 000000000..b1c48292b
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_leak.right
@@ -0,0 +1,6 @@
+4
+4
+4
+4
+4
+4
diff --git a/shell/hush_test/hush-redir/redir_leak.tests b/shell/hush_test/hush-redir/redir_leak.tests
new file mode 100755
index 000000000..c8a9c6343
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_leak.tests
@@ -0,0 +1,10 @@
+# Each of these should show only four lines:
+# fds 0,1,2 are stdio; fd 3 is open by opendir() in ls.
+# This test detects bugs where redirects leave stray open fds.
+
+ls -1 /proc/self/fd | wc -l
+ls -1 /proc/self/fd >/proc/self/fd/1 | wc -l
+ls -1 /proc/self/fd >/proc/self/fd/1 2>&1 | wc -l
+echo "`ls -1 /proc/self/fd `" | wc -l
+echo "`ls -1 /proc/self/fd >/proc/self/fd/1 `" | wc -l
+echo "`ls -1 /proc/self/fd >/proc/self/fd/1 2>&1 `" | wc -l