Merge branch 'origin/master' (early part)

16 files changed, 235 insertions, 140 deletions

diff --git a/shell/Config.src b/shell/Config.src
index 6389d943a..c9c2439e7 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -62,29 +62,6 @@ config FEATURE_BASH_IS_NONE
 endchoice
 
 
-config LASH
-        bool "lash (deprecated: aliased to hush)"
-        default n
-        select HUSH
-        help
-          lash is deprecated and will be removed, please migrate to hush.
-
-config MSH
-        bool "msh (deprecated: please use hush)"
-        default n
-        select 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.
-
-#         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 SH_MATH_SUPPORT
         bool "POSIX math support"
         default y
@@ -158,40 +135,4 @@ config FEATURE_SH_NOFORK
 
           This feature is relatively new. Use with care.
 
-config CTTYHACK
-        bool "cttyhack"
-        default y
-        help
-          One common problem reported on the mailing list is "can't access tty;
-          job control turned off" error message which typically appears when
-          one tries to use shell with stdin/stdout opened to /dev/console.
-          This device is special - it cannot be a controlling tty.
-
-          Proper solution is to use correct device instead of /dev/console.
-
-          cttyhack provides "quick and dirty" solution to this problem.
-          It analyzes stdin with various ioctls, trying to determine whether
-          it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
-          If it detects one, it closes stdin/out/err and reopens that device.
-          Then it executes given program. Opening the device will make
-          that device a controlling tty. This may require cttyhack
-          to be a session leader.
-
-          Example for /etc/inittab (for busybox init):
-
-          ::respawn:/bin/cttyhack /bin/sh
-
-          Starting an interactive shell from boot shell script:
-
-          setsid cttyhack sh
-
-          Giving controlling tty to shell running with PID 1:
-
-          # exec cttyhack sh
-
-          Without cttyhack, you need to know exact tty name,
-          and do something like this:
-
-          # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
-
 endmenu
diff --git a/shell/Kbuild.src b/shell/Kbuild.src
index bce99240f..a669bdfb0 100644
--- a/shell/Kbuild.src
+++ b/shell/Kbuild.src
@@ -8,5 +8,4 @@ lib-y:=
 
 INSERT
 
-lib-$(CONFIG_CTTYHACK) += cttyhack.o
 lib-$(CONFIG_SH_MATH_SUPPORT) += math.o
diff --git a/shell/ash.c b/shell/ash.c
index 2cee0c42f..308cc0273 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -193,6 +193,7 @@
 //config:         "PS#" may contain volatile content, such as backquote commands.
 //config:         This option recreates the prompt string from the environment
 //config:         variable each time it is displayed.
+//config:
 
 //usage:#define ash_trivial_usage NOUSAGE_STR
 //usage:#define ash_full_usage ""
@@ -4844,6 +4845,7 @@ clear_traps(void)
                         INT_ON;
                 }
         }
+        may_have_traps = 0;
 }
 
 /* Lives far away from here, needed for forkchild */
@@ -6615,13 +6617,14 @@ parse_sub_pattern(char *arg, int inquotes)
 #endif /* ENABLE_ASH_BASH_COMPAT */
 
 static const char *
-subevalvar(char *p, char *str, int strloc, int subtype,
+subevalvar(char *p, char *varname, int strloc, int subtype,
                 int startloc, int varflags, int quotes, struct strlist *var_str_list)
 {
         struct nodelist *saveargbackq = argbackq;
         char *startp;
         char *loc;
         char *rmesc, *rmescend;
+        char *str;
         IF_ASH_BASH_COMPAT(const char *repl = NULL;)
         IF_ASH_BASH_COMPAT(int pos, len, orig_len;)
         int saveherefd = herefd;
@@ -6629,6 +6632,9 @@ subevalvar(char *p, char *str, int strloc, int subtype,
         int zero;
         char *(*scan)(char*, char*, char*, char*, int, int);
 
+        //bb_error_msg("subevalvar(p:'%s',varname:'%s',strloc:%d,subtype:%d,startloc:%d,varflags:%x,quotes:%d",
+        //                      p, varname, strloc, subtype, startloc, varflags, quotes);
+
         herefd = -1;
         argstr(p, (subtype != VSASSIGN && subtype != VSQUESTION) ? EXP_CASE : 0,
                         var_str_list);
@@ -6639,11 +6645,15 @@ subevalvar(char *p, char *str, int strloc, int subtype,
 
         switch (subtype) {
         case VSASSIGN:
-                setvar(str, startp, 0);
+                setvar(varname, startp, 0);
                 amount = startp - expdest;
                 STADJUST(amount, expdest);
                 return startp;
 
+        case VSQUESTION:
+                varunset(p, varname, startp, varflags);
+                /* NOTREACHED */
+
 #if ENABLE_ASH_BASH_COMPAT
         case VSSUBSTR:
                 loc = str = stackblock() + strloc;
@@ -6704,11 +6714,8 @@ subevalvar(char *p, char *str, int strloc, int subtype,
                 STADJUST(amount, expdest);
                 return loc;
 #endif
-
-        case VSQUESTION:
-                varunset(p, str, startp, varflags);
-                /* NOTREACHED */
         }
+
         resetloc = expdest - (char *)stackblock();
 
         /* We'll comeback here if we grow the stack while handling
@@ -6742,13 +6749,14 @@ subevalvar(char *p, char *str, int strloc, int subtype,
 
                 if (!repl) {
                         repl = parse_sub_pattern(str, varflags & VSQUOTE);
+                        //bb_error_msg("repl:'%s'", repl);
                         if (!repl)
                                 repl = nullstr;
                 }
 
                 /* If there's no pattern to match, return the expansion unmolested */
                 if (str[0] == '\0')
-                        return 0;
+                        return NULL;
 
                 len = 0;
                 idx = startp;
@@ -6756,6 +6764,7 @@ subevalvar(char *p, char *str, int strloc, int subtype,
                 while (idx < end) {
  try_to_match:
                         loc = scanright(idx, rmesc, rmescend, str, quotes, 1);
+                        //bb_error_msg("scanright('%s'):'%s'", str, loc);
                         if (!loc) {
                                 /* No match, advance */
                                 char *restart_detect = stackblock();
@@ -6794,6 +6803,7 @@ subevalvar(char *p, char *str, int strloc, int subtype,
                                 idx = loc;
                         }
 
+                        //bb_error_msg("repl:'%s'", repl);
                         for (loc = (char*)repl; *loc; loc++) {
                                 char *restart_detect = stackblock();
                                 if (quotes && *loc == '\\') {
@@ -6829,6 +6839,7 @@ subevalvar(char *p, char *str, int strloc, int subtype,
                 STPUTC('\0', expdest);
                 startp = (char *)stackblock() + startloc;
                 memmove(startp, (char *)stackblock() + workloc, len + 1);
+                //bb_error_msg("startp:'%s'", startp);
                 amount = expdest - (startp + len);
                 STADJUST(-amount, expdest);
                 return startp;
@@ -7129,7 +7140,7 @@ evalvar(char *p, int flags, struct strlist *var_str_list)
                  */
                 STPUTC('\0', expdest);
                 patloc = expdest - (char *)stackblock();
-                if (NULL == subevalvar(p, /* str: */ NULL, patloc, subtype,
+                if (NULL == subevalvar(p, /* varname: */ NULL, patloc, subtype,
                                 startloc, varflags,
 //TODO: | EXP_REDIR too? All other such places do it too
                                 /* quotes: */ flags & (EXP_FULL | EXP_CASE),
@@ -11577,8 +11588,11 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                                 USTPUTC('\\', out);
                                         }
 #endif
-                                        if (dblquote && c != '\\'
-                                         && c != '`' && c != '$'
+                                        /* Backslash is retained if we are in "str" and next char isn't special */
+                                        if (dblquote
+                                         && c != '\\'
+                                         && c != '`'
+                                         && c != '$'
                                          && (c != '"' || eofmark != NULL)
                                         ) {
                                                 USTPUTC(CTLESC, out);
@@ -11650,7 +11664,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                         } else {
                                                 /*
                                                  * unbalanced parens
-                                                 *  (don't 2nd guess - no error)
+                                                 * (don't 2nd guess - no error)
                                                  */
                                                 pungetc();
                                                 USTPUTC(')', out);
@@ -11678,7 +11692,6 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                 }
                                 IF_ASH_ALIAS(if (c != PEOA))
                                         USTPUTC(c, out);
-
                         }
                         c = pgetc_fast();
                 } /* for (;;) */
@@ -11844,8 +11857,6 @@ parsesub: {
         unsigned char subtype;
         int typeloc;
         int flags;
-        char *p;
-        static const char types[] ALIGN1 = "}-+?=";
 
         c = pgetc();
         if (c > 255 /* PEOA or PEOF */
@@ -11858,7 +11869,8 @@ parsesub: {
 #endif
                         USTPUTC('$', out);
                 pungetc();
-        } else if (c == '(') {  /* $(command) or $((arith)) */
+        } else if (c == '(') {
+                /* $(command) or $((arith)) */
                 if (pgetc() == '(') {
 #if ENABLE_SH_MATH_SUPPORT
                         PARSEARITH();
@@ -11870,6 +11882,7 @@ parsesub: {
                         PARSEBACKQNEW();
                 }
         } else {
+                /* $VAR, $<specialchar>, ${...}, or PEOA/PEOF */
                 USTPUTC(CTLVAR, out);
                 typeloc = out - (char *)stackblock();
                 USTPUTC(VSNORMAL, out);
@@ -11879,76 +11892,85 @@ parsesub: {
                         if (c == '#') {
                                 c = pgetc();
                                 if (c == '}')
-                                        c = '#';
+                                        c = '#'; /* ${#} - same as $# */
                                 else
-                                        subtype = VSLENGTH;
-                        } else
+                                        subtype = VSLENGTH; /* ${#VAR} */
+                        } else {
                                 subtype = 0;
+                        }
                 }
                 if (c <= 255 /* not PEOA or PEOF */ && is_name(c)) {
+                        /* $[{[#]]NAME[}] */
                         do {
                                 STPUTC(c, out);
                                 c = pgetc();
                         } while (c <= 255 /* not PEOA or PEOF */ && is_in_name(c));
                 } else if (isdigit(c)) {
+                        /* $[{[#]]NUM[}] */
                         do {
                                 STPUTC(c, out);
                                 c = pgetc();
                         } while (isdigit(c));
                 } else if (is_special(c)) {
+                        /* $[{[#]]<specialchar>[}] */
                         USTPUTC(c, out);
                         c = pgetc();
                 } else {
  badsub:
                         raise_error_syntax("bad substitution");
                 }
-                if (c != '}' && subtype == VSLENGTH)
+                if (c != '}' && subtype == VSLENGTH) {
+                        /* ${#VAR didn't end with } */
                         goto badsub;
+                }
 
                 STPUTC('=', out);
                 flags = 0;
                 if (subtype == 0) {
+                        /* ${VAR...} but not $VAR or ${#VAR} */
+                        /* c == first char after VAR */
                         switch (c) {
                         case ':':
                                 c = pgetc();
 #if ENABLE_ASH_BASH_COMPAT
                                 if (c == ':' || c == '$' || isdigit(c)) {
-                                        pungetc();
                                         subtype = VSSUBSTR;
-                                        break;
+                                        pungetc();
+                                        break; /* "goto do_pungetc" is bigger (!) */
                                 }
 #endif
                                 flags = VSNUL;
                                 /*FALLTHROUGH*/
-                        default:
-                                p = strchr(types, c);
+                        default: {
+                                static const char types[] ALIGN1 = "}-+?=";
+                                const char *p = strchr(types, c);
                                 if (p == NULL)
                                         goto badsub;
                                 subtype = p - types + VSNORMAL;
                                 break;
+                        }
                         case '%':
                         case '#': {
                                 int cc = c;
-                                subtype = c == '#' ? VSTRIMLEFT : VSTRIMRIGHT;
+                                subtype = (c == '#' ? VSTRIMLEFT : VSTRIMRIGHT);
                                 c = pgetc();
-                                if (c == cc)
-                                        subtype++;
-                                else
-                                        pungetc();
+                                if (c != cc)
+                                        goto do_pungetc;
+                                subtype++;
                                 break;
                         }
 #if ENABLE_ASH_BASH_COMPAT
                         case '/':
                                 subtype = VSREPLACE;
                                 c = pgetc();
-                                if (c == '/')
-                                        subtype++; /* VSREPLACEALL */
-                                else
-                                        pungetc();
+                                if (c != '/')
+                                        goto do_pungetc;
+                                subtype++; /* VSREPLACEALL */
                                 break;
 #endif
                         }
                 } else {
+ do_pungetc:
                         pungetc();
                 }
                 if (dblquote || arinest)
@@ -12518,7 +12540,6 @@ evalcmd(int argc UNUSED_PARAM, char **argv)
                         p = grabstackstr(concat);
                 }
                 evalstring(p, ~SKIPEVAL);
-
         }
         return exitstatus;
 }
diff --git a/shell/ash_test/ash-redir/redir9.tests b/shell/ash_test/ash-redir/redir9.tests
index 8befa611c..8befa611c 100644..100755
--- a/shell/ash_test/ash-redir/redir9.tests
+++ b/shell/ash_test/ash-redir/redir9.tests
diff --git a/shell/ash_test/ash-signals/signal7.right b/shell/ash_test/ash-signals/signal7.right
new file mode 100644
index 000000000..ba7453e42
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal7.right
@@ -0,0 +1 @@
+Bug detected: 0
diff --git a/shell/ash_test/ash-signals/signal7.tests b/shell/ash_test/ash-signals/signal7.tests
new file mode 100755
index 000000000..c2b1381f9
--- /dev/null
+++ b/shell/ash_test/ash-signals/signal7.tests
@@ -0,0 +1,18 @@
+bug() {
+        trap : exit
+        # Bug was causing sh to be run in subshell,
+        # as if this line is replaced with (sh -c ...; exit $?) &
+        # here:
+        sh -c 'echo REAL_CHILD=$$' &
+        echo PARENTS_IDEA_OF_CHILD=$!
+        wait  # make sure bkgd shell completes
+}
+
+bug | {
+while read varval; do
+        eval $varval
+done
+test x"$REAL_CHILD" != x"" \
+&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD"
+echo "Bug detected: $?"
+}
diff --git a/shell/ash_test/ash-vars/var_bash3.right b/shell/ash_test/ash-vars/var_bash3.right
index f7f14791e..a97c850ea 100644
--- a/shell/ash_test/ash-vars/var_bash3.right
+++ b/shell/ash_test/ash-vars/var_bash3.right
@@ -1,20 +1,20 @@
-a041#c
-a041#c
-a\041#c
-a\041#c
-a\041#c
-a\041#c
-a\041#c
-a\041#c
-a\041#c
-a\c
-a\c
-a\c
-a\\c
-a\\c
-a\\c
-a\tc
-a\tc
-a\tc
-atc
-a\tc
+1 a041#c
+2 a041#c
+3 a\041#c
+4 a\041#c
+5 a\041#c
+6 a\041#c
+7 a\041#c
+8 a\041#c
+9 a\041#c
+10 a\c
+11 a\c
+12 a\c
+13 a\\c
+14 a\\c
+15 a\\c
+16 a\tc
+17 a\tc
+18 a\tc
+19 atc
+20 a\tc
diff --git a/shell/ash_test/ash-vars/var_bash3.tests b/shell/ash_test/ash-vars/var_bash3.tests
index b9050279e..eca3318e2 100755
--- a/shell/ash_test/ash-vars/var_bash3.tests
+++ b/shell/ash_test/ash-vars/var_bash3.tests
@@ -1,41 +1,48 @@
 a='abc'
 r=${a//b/\041#}
-echo $r
-echo ${a//b/\041#}
-echo "${a//b/\041#}"
+echo 1 $r
+echo 2 ${a//b/\041#}
+echo 3 "${a//b/\041#}"
+# --- var_bash3.xx
+# +++ var_bash3.right
+# -1 a\041#c
+# +1 a041#c
+#  2 a041#c
+# -3 a041#c
+# +3 a\041#c
 
 a='abc'
 r=${a//b/\\041#}
-echo $r
-echo ${a//b/\\041#}
-echo "${a//b/\\041#}"
+echo 4 $r
+echo 5 ${a//b/\\041#}
+echo 6 "${a//b/\\041#}"
 
 a='abc'
 b='\041#'
 r=${a//b/$b}
-echo $r
-echo ${a//b/$b}
-echo "${a//b/$b}"
+echo 7 $r
+echo 8 ${a//b/$b}
+echo 9 "${a//b/$b}"
 
 a='abc'
 b='\'
 r="${a//b/$b}"
-echo $r
-echo ${a//b/$b}
-echo "${a//b/$b}"
+echo 10 $r
+echo 11 ${a//b/$b}
+echo 12 "${a//b/$b}"
 
 a='abc'
 b='\\'
 r="${a//b/$b}"
-echo $r
-echo ${a//b/$b}
-echo "${a//b/$b}"
+echo 13 $r
+echo 14 ${a//b/$b}
+echo 15 "${a//b/$b}"
 
 a='abc'
 b='\t'
 r="${a//b/$b}"
-echo $r
-echo ${a//b/$b}
-echo "${a//b/$b}"
-echo ${a//b/\t}
-echo "${a//b/\t}"
+echo 16 $r
+echo 17 ${a//b/$b}
+echo 18 "${a//b/$b}"
+echo 19 ${a//b/\t}
+echo 20 "${a//b/\t}"
diff --git a/shell/ash_test/ash-vars/var_bash4.right b/shell/ash_test/ash-vars/var_bash4.right
new file mode 100644
index 000000000..fc3a9e41c
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash4.right
@@ -0,0 +1,4 @@
+In assignment: a*b-backslashstar-
+Unquoted: a*b-backslashstar-
+Quoted: a*b-backslashstar-
+Done: 0
diff --git a/shell/ash_test/ash-vars/var_bash4.tests b/shell/ash_test/ash-vars/var_bash4.tests
new file mode 100755
index 000000000..3b323c576
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash4.tests
@@ -0,0 +1,6 @@
+FOO='a*b\*c'
+BAR=${FOO//\\*/-backslashstar-}
+echo In assignment: "$BAR"
+echo Unquoted: ${FOO//\\*/-backslashstar-}
+echo Quoted: "${FOO//\\*/-backslashstar-}"
+echo Done: $?
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 67736ad62..7a5e1ffd2 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -6,6 +6,62 @@
  */
 #include "libbb.h"
 
+//applet:IF_CTTYHACK(APPLET(cttyhack, _BB_DIR_BIN, _BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
+
+//config:config CTTYHACK
+//config:       bool "cttyhack"
+//config:       default y
+//config:       help
+//config:         One common problem reported on the mailing list is "can't access tty;
+//config:         job control turned off" error message which typically appears when
+//config:         one tries to use shell with stdin/stdout opened to /dev/console.
+//config:         This device is special - it cannot be a controlling tty.
+//config:
+//config:         Proper solution is to use correct device instead of /dev/console.
+//config:
+//config:         cttyhack provides "quick and dirty" solution to this problem.
+//config:         It analyzes stdin with various ioctls, trying to determine whether
+//config:         it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
+//config:         If it detects one, it closes stdin/out/err and reopens that device.
+//config:         Then it executes given program. Opening the device will make
+//config:         that device a controlling tty. This may require cttyhack
+//config:         to be a session leader.
+//config:
+//config:         Example for /etc/inittab (for busybox init):
+//config:
+//config:         ::respawn:/bin/cttyhack /bin/sh
+//config:
+//config:         Starting an interactive shell from boot shell script:
+//config:
+//config:         setsid cttyhack sh
+//config:
+//config:         Giving controlling tty to shell running with PID 1:
+//config:
+//config:         # exec cttyhack sh
+//config:
+//config:         Without cttyhack, you need to know exact tty name,
+//config:         and do something like this:
+//config:
+//config:         # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+//config:
+
+//usage:#define cttyhack_trivial_usage
+//usage:       "PROG ARGS"
+//usage:#define cttyhack_full_usage "\n\n"
+//usage:       "Give PROG a controlling tty if possible."
+//usage:     "\nExample for /etc/inittab (for busybox init):"
+//usage:     "\n        ::respawn:/bin/cttyhack /bin/sh"
+//usage:     "\nGiving controlling tty to shell running with PID 1:"
+//usage:     "\n        $ exec cttyhack sh"
+//usage:     "\nStarting interactive shell from boot shell script:"
+//usage:     "\n        setsid cttyhack sh"
+
+#if !defined(__linux__) && !defined(TIOCGSERIAL) && !ENABLE_WERROR
+# warning cttyhack will not be able to detect a controlling tty on this system
+#endif
+
 /* From <linux/vt.h> */
 struct vt_stat {
         unsigned short v_active;        /* active vt */
@@ -59,13 +115,19 @@ int cttyhack_main(int argc UNUSED_PARAM, char **argv)
                 close(fd);
         } else {
                 /* We don't have ctty (or don't have "/dev/tty" node...) */
-                if (ioctl(0, TIOCGSERIAL, &u.sr) == 0) {
+                if (0) {}
+#ifdef TIOCGSERIAL
+                else if (ioctl(0, TIOCGSERIAL, &u.sr) == 0) {
                         /* this is a serial console */
                         sprintf(console + 8, "S%d", u.sr.line);
-                } else if (ioctl(0, VT_GETSTATE, &u.vt) == 0) {
+                }
+#endif
+#ifdef __linux__
+                else if (ioctl(0, VT_GETSTATE, &u.vt) == 0) {
                         /* this is linux virtual tty */
                         sprintf(console + 8, "S%d" + 1, u.vt.v_active);
                 }
+#endif
                 if (console[8]) {
                         fd = xopen(console, O_RDWR);
                         //bb_error_msg("switching to '%s'", console);
diff --git a/shell/hush.c b/shell/hush.c
index 56a3f4b14..0a420f685 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -224,6 +224,20 @@
 //config:         This instructs hush to print commands before execution.
 //config:         Adds ~300 bytes.
 //config:
+//config:config LASH
+//config:       bool "lash (deprecated: aliased to hush)"
+//config:       default n
+//config:       select HUSH
+//config:       help
+//config:         lash is deprecated and will be removed, please migrate to hush.
+//config:
+//config:config MSH
+//config:       bool "msh (deprecated: aliased to hush)"
+//config:       default n
+//config:       select HUSH
+//config:       help
+//config:         msh is deprecated and will be removed, please migrate to hush.
+//config:
 
 //usage:#define hush_trivial_usage NOUSAGE_STR
 //usage:#define hush_full_usage ""
@@ -4094,8 +4108,6 @@ static void insert_bg_job(struct pipe *pi)
 
         if (G_interactive_fd)
                 printf("[%d] %d %s\n", job->jobid, job->cmds[0].pid, job->cmdtext);
-        /* Last command's pid goes to $! */
-        G.last_bg_pid = job->cmds[job->num_cmds - 1].pid;
         G.last_jobid = job->jobid;
 }
 
@@ -4506,7 +4518,6 @@ static NOINLINE int run_pipe(struct pipe *pi)
 #ifdef CMD_SINGLEWORD_NOGLOB_COND
                 else if (command->cmd_type == CMD_SINGLEWORD_NOGLOB_COND) {
                         argv_expanded = expand_strvec_to_strvec_singleword_noglob_cond(argv + command->assignment_cnt);
-
                 }
 #endif
                 else {
@@ -5062,6 +5073,8 @@ static int run_list(struct pipe *pi)
                                 if (G.run_list_level == 1)
                                         insert_bg_job(pi);
 #endif
+                                /* Last command's pid goes to $! */
+                                G.last_bg_pid = pi->cmds[pi->num_cmds - 1].pid;
                                 G.last_exitcode = rcode = EXIT_SUCCESS;
                                 debug_printf_exec(": cmd&: exitcode EXIT_SUCCESS\n");
                         } else {
diff --git a/shell/hush_test/hush-misc/break1.tests b/shell/hush_test/hush-misc/break1.tests
index 912f149c1..3a6b060d9 100755
--- a/shell/hush_test/hush-misc/break1.tests
+++ b/shell/hush_test/hush-misc/break1.tests
@@ -1,3 +1,2 @@
 while true; do echo A; break; echo B; done
 echo OK:$?
-
diff --git a/shell/hush_test/hush-trap/signal7.right b/shell/hush_test/hush-trap/signal7.right
new file mode 100644
index 000000000..ba7453e42
--- /dev/null
+++ b/shell/hush_test/hush-trap/signal7.right
@@ -0,0 +1 @@
+Bug detected: 0
diff --git a/shell/hush_test/hush-trap/signal7.tests b/shell/hush_test/hush-trap/signal7.tests
new file mode 100755
index 000000000..c2b1381f9
--- /dev/null
+++ b/shell/hush_test/hush-trap/signal7.tests
@@ -0,0 +1,18 @@
+bug() {
+        trap : exit
+        # Bug was causing sh to be run in subshell,
+        # as if this line is replaced with (sh -c ...; exit $?) &
+        # here:
+        sh -c 'echo REAL_CHILD=$$' &
+        echo PARENTS_IDEA_OF_CHILD=$!
+        wait  # make sure bkgd shell completes
+}
+
+bug | {
+while read varval; do
+        eval $varval
+done
+test x"$REAL_CHILD" != x"" \
+&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD"
+echo "Bug detected: $?"
+}
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 840e03bff..957d71928 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -435,9 +435,14 @@ shell_builtin_ulimit(char **argv)
                                                 val <<= l->factor_shift;
                                         }
 //bb_error_msg("opt %c val_str:'%s' val:%lld", opt_char, val_str, (long long)val);
+                                        /* from man bash: "If neither -H nor -S
+                                         * is specified, both the soft and hard
+                                         * limits are set. */
+                                        if (!opts)
+                                                opts = OPT_hard + OPT_soft;
                                         if (opts & OPT_hard)
                                                 limit.rlim_max = val;
-                                        if ((opts & OPT_soft) || opts == 0)
+                                        if (opts & OPT_soft)
                                                 limit.rlim_cur = val;
 //bb_error_msg("setrlimit(%d, %lld, %lld)", l->cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max);
                                         if (setrlimit(l->cmd, &limit) < 0) {