diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/eval.c | 17 | ||||
| -rw-r--r-- | src/eval.h | 1 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/trap.c | 3 |
5 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 297b81a..aa230ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * Do not allow break to break across function calls. * Move common skipcount logic into skiploop. * Allow return in loop conditional to set exit status. + * Return without arguments in a trap should use status outside traps. 2014-10-03 Herbert Xu <herbert@gondor.apana.org.au> diff --git a/src/eval.c b/src/eval.c index 7b341f3..071fb1b 100644 --- a/src/eval.c +++ b/src/eval.c @@ -967,7 +967,7 @@ funcdone: shellparam = saveparam; handler = savehandler; INTON; - evalskip &= ~SKIPFUNC; + evalskip &= ~(SKIPFUNC | SKIPFUNCDEF); return e; } @@ -1047,12 +1047,23 @@ breakcmd(int argc, char **argv) int returncmd(int argc, 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; } diff --git a/src/eval.h b/src/eval.h index 6e62137..6e8acda 100644 --- a/src/eval.h +++ b/src/eval.h @@ -62,3 +62,4 @@ extern int evalskip; #define SKIPBREAK (1 << 0) #define SKIPCONT (1 << 1) #define SKIPFUNC (1 << 2) +#define SKIPFUNCDEF (1 << 3) diff --git a/src/main.c b/src/main.c index 29a258d..00c5e00 100644 --- a/src/main.c +++ b/src/main.c @@ -242,7 +242,7 @@ cmdloop(int top) skip = evalskip; if (skip) { - evalskip &= ~SKIPFUNC; + evalskip &= ~(SKIPFUNC | SKIPFUNCDEF); break; } } diff --git a/src/trap.c b/src/trap.c index 15faeff..b924661 100644 --- a/src/trap.c +++ b/src/trap.c @@ -343,7 +343,8 @@ void dotrap(void) if (!p) continue; evalstring(p, 0); - exitstatus = status; + if (evalskip != SKIPFUNC) + exitstatus = status; } savestatus = last_status; |