Merge branch 'busybox' into merge

18 files changed, 226 insertions, 77 deletions

diff --git a/shell/ash.c b/shell/ash.c
index f33f72b80..252061dae 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -532,11 +532,11 @@ struct globals_misc {
         volatile /*sig_atomic_t*/ smallint got_sigchld; /* 1 = got SIGCHLD */
         volatile /*sig_atomic_t*/ smallint pending_sig; /* last pending signal */
 #endif
-        smallint exception_type; /* kind of exception (0..5) */
-        /* exceptions */
+        smallint exception_type; /* kind of exception: */
 #define EXINT 0         /* SIGINT received */
 #define EXERROR 1       /* a generic error */
-#define EXEXIT 4        /* exit the shell */
+#define EXEND 3         /* exit the shell */
+#define EXEXIT 4        /* exit the shell via exitcmd */
 
         char nullstr[1];        /* zero length string */
 
@@ -6561,6 +6561,8 @@ static int substr_atoi(const char *s)
 #define EXP_VARTILDE2   0x20    /* expand tildes after colons only */
 #define EXP_WORD        0x40    /* expand word in parameter expansion */
 #define EXP_QUOTED      0x100   /* expand word in double quotes */
+#define EXP_KEEPNUL     0x200   /* do not skip NUL characters */
+
 /*
  * rmescape() flags
  */
@@ -6571,8 +6573,6 @@ static int substr_atoi(const char *s)
 
 /* Add CTLESC when necessary. */
 #define QUOTES_ESC     (EXP_FULL | EXP_CASE)
-/* Do not skip NUL characters. */
-#define QUOTES_KEEPNUL EXP_TILDE
 
 /*
  * Structure specifying which parts of the string should be searched
@@ -6879,27 +6879,28 @@ preglob(const char *pattern, int flag)
  * Put a string on the stack.
  */
 static void
-memtodest(const char *p, size_t len, int syntax, int quotes)
+memtodest(const char *p, size_t len, int flags)
 {
+        int syntax = flags & EXP_QUOTED ? DQSYNTAX : BASESYNTAX;
         char *q;
 
         if (!len)
                 return;
 
-        q = makestrspace((quotes & QUOTES_ESC) ? len * 2 : len, expdest);
+        q = makestrspace(len * 2, expdest);
 
         do {
                 unsigned char c = *p++;
                 if (c) {
-                        if (quotes & QUOTES_ESC) {
+                        if (flags & QUOTES_ESC) {
                                 int n = SIT(c, syntax);
                                 if (n == CCTL
-                                 || (syntax != BASESYNTAX && n == CBACK)
+                                 || ((flags & EXP_QUOTED) && n == CBACK)
                                 ) {
                                         USTPUTC(CTLESC, q);
                                 }
                         }
-                } else if (!(quotes & QUOTES_KEEPNUL))
+                } else if (!(flags & EXP_KEEPNUL))
                         continue;
                 USTPUTC(c, q);
         } while (--len);
@@ -6908,10 +6909,10 @@ memtodest(const char *p, size_t len, int syntax, int quotes)
 }
 
 static size_t
-strtodest(const char *p, int syntax, int quotes)
+strtodest(const char *p, int flags)
 {
         size_t len = strlen(p);
-        memtodest(p, len, syntax, quotes);
+        memtodest(p, len, flags);
         return len;
 }
 
@@ -6979,13 +6980,12 @@ removerecordregions(int endoff)
 }
 
 static char *
-exptilde(char *startp, char *p, int flags)
+exptilde(char *startp, char *p, int flag)
 {
         unsigned char c;
         char *name;
         struct passwd *pw;
         const char *home;
-        int quotes = flags & QUOTES_ESC;
 
         name = p + 1;
 
@@ -6996,7 +6996,7 @@ exptilde(char *startp, char *p, int flags)
                 case CTLQUOTEMARK:
                         return startp;
                 case ':':
-                        if (flags & EXP_VARTILDE)
+                        if (flag & EXP_VARTILDE)
                                 goto done;
                         break;
                 case '/':
@@ -7017,7 +7017,7 @@ exptilde(char *startp, char *p, int flags)
         if (!home)
                 goto lose;
         *p = c;
-        strtodest(home, SQSYNTAX, quotes);
+        strtodest(home, flag | EXP_QUOTED);
         return p;
  lose:
         *p = c;
@@ -7127,7 +7127,6 @@ expbackq(union node *cmd, int flag)
         char *p;
         char *dest;
         int startloc;
-        int syntax = flag & EXP_QUOTED ? DQSYNTAX : BASESYNTAX;
         struct stackmark smark;
 
         INT_OFF;
@@ -7141,7 +7140,7 @@ expbackq(union node *cmd, int flag)
         if (i == 0)
                 goto read;
         for (;;) {
-                memtodest(p, i, syntax, flag & QUOTES_ESC);
+                memtodest(p, i, flag);
  read:
                 if (in.fd < 0)
                         break;
@@ -7851,11 +7850,10 @@ varvalue(char *name, int varflags, int flags, int quoted)
         int sep;
         int subtype = varflags & VSTYPE;
         int discard = subtype == VSPLUS || subtype == VSLENGTH;
-        int quotes = (discard ? 0 : (flags & QUOTES_ESC)) | QUOTES_KEEPNUL;
-        int syntax;
 
+        flags |= EXP_KEEPNUL;
+        flags &= discard ? ~QUOTES_ESC : ~0;
         sep = (flags & EXP_FULL) << CHAR_BIT;
-        syntax = quoted ? DQSYNTAX : BASESYNTAX;
 
         switch (*name) {
         case '$':
@@ -7921,11 +7919,11 @@ varvalue(char *name, int varflags, int flags, int quoted)
                 if (!ap)
                         return -1;
                 while ((p = *ap++) != NULL) {
-                        len += strtodest(p, syntax, quotes);
+                        len += strtodest(p, flags);
 
                         if (*ap && sep) {
                                 len++;
-                                memtodest(&sepc, 1, syntax, quotes);
+                                memtodest(&sepc, 1, flags);
                         }
                 }
                 break;
@@ -7952,7 +7950,7 @@ varvalue(char *name, int varflags, int flags, int quoted)
                 if (!p)
                         return -1;
 
-                len = strtodest(p, syntax, quotes);
+                len = strtodest(p, flags);
 #if ENABLE_UNICODE_SUPPORT
                 if (subtype == VSLENGTH && len > 0) {
                         reinit_unicode_for_ash();
@@ -8795,7 +8793,7 @@ static void shellexec(char *prog, char **argv, const char *path, int idx)
         exitstatus = exerrno;
         TRACE(("shellexec failed for %s, errno %d, suppress_int %d\n",
                 prog, e, suppress_int));
-        ash_msg_and_raise(EXEXIT, "%s: %s", prog, errmsg(e, "not found"));
+        ash_msg_and_raise(EXEND, "%s: %s", prog, errmsg(e, "not found"));
         /* NOTREACHED */
 }
 
@@ -9742,6 +9740,7 @@ defun(union node *func)
 #define SKIPBREAK      (1 << 0)
 #define SKIPCONT       (1 << 1)
 #define SKIPFUNC       (1 << 2)
+#define SKIPFUNCDEF    (1 << 3)
 static smallint evalskip;       /* set to SKIPxxx if we are skipping commands */
 static int skipcount;           /* number of levels to skip */
 #if ENABLE_PLATFORM_POSIX
@@ -9802,7 +9801,8 @@ dotrap(void)
                 if (!p)
                         continue;
                 evalstring(p, 0);
-                exitstatus = status;
+                if (evalskip != SKIPFUNC)
+                        exitstatus = status;
         }
 
         savestatus = last_status;
@@ -9946,9 +9946,9 @@ evaltree(union node *n, int flags)
         dotrap();
 
         if (checkexit & status)
-                raise_exception(EXEXIT);
+                raise_exception(EXEND);
         if (flags & EV_EXIT)
-                raise_exception(EXEXIT);
+                raise_exception(EXEND);
 
         popstackmark(&smark);
         TRACE(("leaving evaltree (no interrupts)\n"));
@@ -10462,7 +10462,7 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         shellparam = saveparam;
         exception_handler = savehandler;
         INT_ON;
-        evalskip &= ~SKIPFUNC;
+        evalskip &= ~(SKIPFUNC | SKIPFUNCDEF);
         return e;
 }
 
@@ -10607,12 +10607,23 @@ execcmd(int argc UNUSED_PARAM, char **argv)
 static int FAST_FUNC
 returncmd(int argc UNUSED_PARAM, char **argv)
 {
+        int skip;
+        int status;
+
         /*
          * If called outside a function, do what ksh does;
          * skip the rest of the file.
          */
-        evalskip = SKIPFUNC;
-        return argv[1] ? number(argv[1]) : exitstatus;
+        if (argv[1]) {
+                skip = SKIPFUNC;
+                status = number(argv[1]);
+        } else {
+                skip = SKIPFUNCDEF;
+                status = exitstatus;
+        }
+        evalskip = skip;
+
+        return status;
 }
 
 /* Forward declarations for builtintab[] */
@@ -14100,7 +14111,7 @@ cmdloop(int top)
                 skip = evalskip;
 
                 if (skip) {
-                        evalskip &= ~SKIPFUNC;
+                        evalskip &= ~(SKIPFUNC | SKIPFUNCDEF);
                         break;
                 }
         }
@@ -14889,6 +14900,47 @@ ulimitcmd(int argc UNUSED_PARAM, char **argv)
 /* ============ main() and helpers */
 
 /*
+ * This routine is called when an error or an interrupt occurs in an
+ * interactive shell and control is returned to the main command loop
+ * but prior to exitshell.
+ */
+static void
+exitreset(void)
+{
+        /* from eval.c: */
+        if (savestatus >= 0) {
+                if (exception_type == EXEXIT || evalskip == SKIPFUNCDEF)
+                        exitstatus = savestatus;
+                savestatus = -1;
+        }
+        evalskip = 0;
+        loopnest = 0;
+
+        /* from expand.c: */
+        ifsfree();
+
+        /* from redir.c: */
+        unwindredir(NULL);
+}
+
+/*
+ * This routine is called when an error or an interrupt occurs in an
+ * interactive shell and control is returned to the main command loop.
+ * (In dash, this function is auto-generated by build machinery).
+ */
+static void
+reset(void)
+{
+        /* from input.c: */
+        g_parsefile->left_in_buffer = 0;
+        g_parsefile->left_in_line = 0;      /* clear input buffer */
+        popallfiles();
+
+        /* from var.c: */
+        unwindlocalvars(NULL);
+}
+
+/*
  * Called to exit the shell.
  */
 static void
@@ -14911,15 +14963,17 @@ exitshell(void)
                 trap[0] = NULL;
                 evalskip = 0;
                 evalstring(p, 0);
+                evalskip = SKIPFUNCDEF;
                 /*free(p); - we'll exit soon */
         }
  out:
+        exitreset();
         /* dash wraps setjobctl(0) in "if (setjmp(loc.loc) == 0) {...}".
          * our setjobctl(0) does not panic if tcsetpgrp fails inside it.
          */
         setjobctl(0);
         flush_stdout_stderr();
-        _exit(savestatus);
+        _exit(exitstatus);
         /* NOTREACHED */
 }
 
@@ -15174,46 +15228,6 @@ read_profile(const char *name)
         popfile();
 }
 
-/*
- * This routine is called when an error or an interrupt occurs in an
- * interactive shell and control is returned to the main command loop
- * but prior to exitshell.
- */
-static void
-exitreset(void)
-{
-        /* from eval.c: */
-        evalskip = 0;
-        loopnest = 0;
-        if (savestatus >= 0) {
-                exitstatus = savestatus;
-                savestatus = -1;
-        }
-
-        /* from expand.c: */
-        ifsfree();
-
-        /* from redir.c: */
-        unwindredir(NULL);
-}
-
-/*
- * This routine is called when an error or an interrupt occurs in an
- * interactive shell and control is returned to the main command loop.
- * (In dash, this function is auto-generated by build machinery).
- */
-static void
-reset(void)
-{
-        /* from input.c: */
-        g_parsefile->left_in_buffer = 0;
-        g_parsefile->left_in_line = 0;      /* clear input buffer */
-        popallfiles();
-
-        /* from var.c: */
-        unwindlocalvars(NULL);
-}
-
 #if PROFILE
 static short profile_buf[16384];
 extern int etext();
@@ -15264,7 +15278,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
 
                 e = exception_type;
                 s = state;
-                if (e == EXEXIT || s == 0 || iflag == 0 || shlvl) {
+                if (e == EXEND || e == EXEXIT || s == 0 || iflag == 0 || shlvl) {
                         exitshell();
                 }
 
diff --git a/shell/ash_test/ash-misc/exitcode_trap3.right b/shell/ash_test/ash-misc/exitcode_trap3.right
new file mode 100644
index 000000000..f275cdc45
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap3.right
@@ -0,0 +1,2 @@
+TERM
+42:42
diff --git a/shell/ash_test/ash-misc/exitcode_trap3.tests b/shell/ash_test/ash-misc/exitcode_trap3.tests
new file mode 100755
index 000000000..98745e463
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap3.tests
@@ -0,0 +1,9 @@
+# "return" in trap should not use last command's exitcode,
+# but exitcode on entering the trap.
+trap "echo TERM;return" term
+f() {
+        (sleep 1; kill $$) &
+        until (exit 42) do (exit 42); done
+}
+f
+echo 42:$?
diff --git a/shell/ash_test/ash-misc/exitcode_trap4.right b/shell/ash_test/ash-misc/exitcode_trap4.right
new file mode 100644
index 000000000..ed6989593
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap4.right
@@ -0,0 +1,2 @@
+TERM
+11:11
diff --git a/shell/ash_test/ash-misc/exitcode_trap4.tests b/shell/ash_test/ash-misc/exitcode_trap4.tests
new file mode 100755
index 000000000..36dba90bd
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap4.tests
@@ -0,0 +1,8 @@
+# "return" in trap sets $? after trap
+trap "echo TERM;return 11" term
+f() {
+        (sleep 1; kill $$) &
+        until (exit 42) do (exit 42); done
+}
+f
+echo 11:$?
diff --git a/shell/ash_test/ash-misc/exitcode_trap5.right b/shell/ash_test/ash-misc/exitcode_trap5.right
new file mode 100644
index 000000000..1ad4443b4
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap5.right
@@ -0,0 +1,3 @@
+TERM
+Nested
+Zero:0
diff --git a/shell/ash_test/ash-misc/exitcode_trap5.tests b/shell/ash_test/ash-misc/exitcode_trap5.tests
new file mode 100755
index 000000000..332a06463
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap5.tests
@@ -0,0 +1,10 @@
+# "return" in trap sets $? after trap...
+# ...but not a nested one!
+g() { echo Nested; return 22; }
+trap "echo TERM;false;g" term
+f() {
+        (kill $$) &
+        sleep 1
+}
+f
+echo Zero:$?
diff --git a/shell/ash_test/ash-misc/exitcode_trap6.right b/shell/ash_test/ash-misc/exitcode_trap6.right
new file mode 100644
index 000000000..b76c1908e
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap6.right
@@ -0,0 +1,2 @@
+INT
+42:42
diff --git a/shell/ash_test/ash-misc/exitcode_trap6.tests b/shell/ash_test/ash-misc/exitcode_trap6.tests
new file mode 100755
index 000000000..15fb99d2d
--- /dev/null
+++ b/shell/ash_test/ash-misc/exitcode_trap6.tests
@@ -0,0 +1,11 @@
+# "exit" in trap should not use last command's exitcode,
+# but exitcode on entering the trap.
+# Nested trap should not interfere with this.
+$THIS_SH -c '
+ trap "echo INT" int
+ trap "kill -int $$;exit" term
+ kill $$ &
+ (exit 42)
+ wait
+'
+echo 42:$?
diff --git a/shell/hush.c b/shell/hush.c
index bced388bf..357a354e2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -988,6 +988,10 @@ struct globals {
 # define G_fatal_sig_mask 0
 #endif
 #if ENABLE_HUSH_TRAP
+        int pre_trap_exitcode;
+# if ENABLE_HUSH_FUNCTIONS
+        int return_exitcode;
+# endif
         char **traps; /* char *traps[NSIG] */
 # define G_traps G.traps
 #else
@@ -2097,25 +2101,35 @@ static int check_and_run_traps(void)
                 } while (sig < NSIG);
                 break;
  got_sig:
+#if ENABLE_HUSH_TRAP
                 if (G_traps && G_traps[sig]) {
                         debug_printf_exec("%s: sig:%d handler:'%s'\n", __func__, sig, G.traps[sig]);
                         if (G_traps[sig][0]) {
                                 /* We have user-defined handler */
                                 smalluint save_rcode;
+                                int save_pre;
                                 char *argv[3];
                                 /* argv[0] is unused */
                                 argv[1] = xstrdup(G_traps[sig]);
                                 /* why strdup? trap can modify itself: trap 'trap "echo oops" INT' INT */
                                 argv[2] = NULL;
-                                save_rcode = G.last_exitcode;
+                                save_pre = G.pre_trap_exitcode;
+                                G.pre_trap_exitcode = save_rcode = G.last_exitcode;
                                 builtin_eval(argv);
                                 free(argv[1]);
-//FIXME: shouldn't it be set to 128 + sig instead?
+                                G.pre_trap_exitcode = save_pre;
                                 G.last_exitcode = save_rcode;
+# if ENABLE_HUSH_FUNCTIONS
+                                if (G.return_exitcode >= 0) {
+                                        debug_printf_exec("trap exitcode:%d\n", G.return_exitcode);
+                                        G.last_exitcode = G.return_exitcode;
+                                }
+# endif
                                 last_sig = sig;
                         } /* else: "" trap, ignoring signal */
                         continue;
                 }
+#endif
                 /* not a trap: special action */
                 switch (sig) {
                 case SIGINT:
@@ -8127,6 +8141,10 @@ static int run_function(const struct function *funcp, char **argv)
         IF_HUSH_LOCAL(leave_var_nest_level();)
 
         G_flag_return_in_progress = sv_flg;
+# if ENABLE_HUSH_TRAP
+        debug_printf_exec("G.return_exitcode=-1\n");
+        G.return_exitcode = -1; /* invalidate stashed return value */
+# endif
 
         restore_G_args(&sv, argv);
 
@@ -9628,6 +9646,9 @@ static int run_list(struct pipe *pi)
                         debug_printf_exec(": builtin/func exitcode %d\n", rcode);
                         G.last_exitcode = rcode;
                         check_and_run_traps();
+#if ENABLE_HUSH_TRAP && ENABLE_HUSH_FUNCTIONS
+                        rcode = G.last_exitcode; /* "return" in trap can change it, read back */
+#endif
 #if ENABLE_HUSH_LOOPS
                         /* Was it "break" or "continue"? */
                         if (G.flag_break_continue) {
@@ -9684,6 +9705,9 @@ static int run_list(struct pipe *pi)
  check_traps:
                         G.last_exitcode = rcode;
                         check_and_run_traps();
+#if ENABLE_HUSH_TRAP && ENABLE_HUSH_FUNCTIONS
+                        rcode = G.last_exitcode; /* "return" in trap can change it, read back */
+#endif
                 }
 
                 /* Handle "set -e" */
@@ -9907,6 +9931,12 @@ int hush_main(int argc, char **argv)
         INIT_G();
         if (EXIT_SUCCESS != 0) /* if EXIT_SUCCESS == 0, it is already done */
                 G.last_exitcode = EXIT_SUCCESS;
+#if ENABLE_HUSH_TRAP
+# if ENABLE_HUSH_FUNCTIONS
+        G.return_exitcode = -1;
+# endif
+        G.pre_trap_exitcode = -1;
+#endif
 
 #if ENABLE_HUSH_FAST
         G.count_SIGCHLD++; /* ensure it is != G.handled_SIGCHLD */
@@ -10552,8 +10582,13 @@ static int FAST_FUNC builtin_exit(char **argv)
 
         /* note: EXIT trap is run by hush_exit */
         argv = skip_dash_dash(argv);
-        if (argv[0] == NULL)
+        if (argv[0] == NULL) {
+#if ENABLE_HUSH_TRAP
+                if (G.pre_trap_exitcode >= 0) /* "exit" in trap uses $? from before the trap */
+                        hush_exit(G.pre_trap_exitcode);
+#endif
                 hush_exit(G.last_exitcode);
+        }
         /* mimic bash: exit 123abc == exit 255 + error msg */
         xfunc_error_retval = 255;
         /* bash: exit -2 == exit 254, no error msg */
@@ -11745,6 +11780,12 @@ static int FAST_FUNC builtin_return(char **argv)
          * 255  <== we also do this
          */
         rc = parse_numeric_argv1(argv, G.last_exitcode, 0);
+# if ENABLE_HUSH_TRAP
+        if (argv[1]) { /* "return ARG" inside a running trap sets $? */
+                debug_printf_exec("G.return_exitcode=%d\n", rc);
+                G.return_exitcode = rc;
+        }
+# endif
         return rc;
 }
 #endif
diff --git a/shell/hush_test/hush-misc/exitcode_trap3.right b/shell/hush_test/hush-misc/exitcode_trap3.right
new file mode 100644
index 000000000..f275cdc45
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap3.right
@@ -0,0 +1,2 @@
+TERM
+42:42
diff --git a/shell/hush_test/hush-misc/exitcode_trap3.tests b/shell/hush_test/hush-misc/exitcode_trap3.tests
new file mode 100755
index 000000000..98745e463
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap3.tests
@@ -0,0 +1,9 @@
+# "return" in trap should not use last command's exitcode,
+# but exitcode on entering the trap.
+trap "echo TERM;return" term
+f() {
+        (sleep 1; kill $$) &
+        until (exit 42) do (exit 42); done
+}
+f
+echo 42:$?
diff --git a/shell/hush_test/hush-misc/exitcode_trap4.right b/shell/hush_test/hush-misc/exitcode_trap4.right
new file mode 100644
index 000000000..ed6989593
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap4.right
@@ -0,0 +1,2 @@
+TERM
+11:11
diff --git a/shell/hush_test/hush-misc/exitcode_trap4.tests b/shell/hush_test/hush-misc/exitcode_trap4.tests
new file mode 100755
index 000000000..36dba90bd
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap4.tests
@@ -0,0 +1,8 @@
+# "return" in trap sets $? after trap
+trap "echo TERM;return 11" term
+f() {
+        (sleep 1; kill $$) &
+        until (exit 42) do (exit 42); done
+}
+f
+echo 11:$?
diff --git a/shell/hush_test/hush-misc/exitcode_trap5.right b/shell/hush_test/hush-misc/exitcode_trap5.right
new file mode 100644
index 000000000..1ad4443b4
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap5.right
@@ -0,0 +1,3 @@
+TERM
+Nested
+Zero:0
diff --git a/shell/hush_test/hush-misc/exitcode_trap5.tests b/shell/hush_test/hush-misc/exitcode_trap5.tests
new file mode 100755
index 000000000..332a06463
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap5.tests
@@ -0,0 +1,10 @@
+# "return" in trap sets $? after trap...
+# ...but not a nested one!
+g() { echo Nested; return 22; }
+trap "echo TERM;false;g" term
+f() {
+        (kill $$) &
+        sleep 1
+}
+f
+echo Zero:$?
diff --git a/shell/hush_test/hush-misc/exitcode_trap6.right b/shell/hush_test/hush-misc/exitcode_trap6.right
new file mode 100644
index 000000000..b76c1908e
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap6.right
@@ -0,0 +1,2 @@
+INT
+42:42
diff --git a/shell/hush_test/hush-misc/exitcode_trap6.tests b/shell/hush_test/hush-misc/exitcode_trap6.tests
new file mode 100755
index 000000000..15fb99d2d
--- /dev/null
+++ b/shell/hush_test/hush-misc/exitcode_trap6.tests
@@ -0,0 +1,11 @@
+# "exit" in trap should not use last command's exitcode,
+# but exitcode on entering the trap.
+# Nested trap should not interfere with this.
+$THIS_SH -c '
+ trap "echo INT" int
+ trap "kill -int $$;exit" term
+ kill $$ &
+ (exit 42)
+ wait
+'
+echo 42:$?