diff options
author | jilles <jilles@FreeBSD.org> | 2011-04-23 22:28:56 +0000 |
---|---|---|
committer | jilles <jilles@FreeBSD.org> | 2011-04-23 22:28:56 +0000 |
commit | f250dc2f449b2e81b05be3a09647011b8a783e81 (patch) | |
tree | 1769bded7ead74e70ac17d9570ffab4c573e0ade | |
parent | d98bdded177a447c277598fa1add5fef3738ed9f (diff) | |
download | FreeBSD-src-f250dc2f449b2e81b05be3a09647011b8a783e81.zip FreeBSD-src-f250dc2f449b2e81b05be3a09647011b8a783e81.tar.gz |
sh: Allow EV_EXIT through function calls, make {...} <redir more consistent.
If EV_EXIT causes an exit, use the exception mechanism to unwind
redirections and local variables. This way, if the final command is a
redirected command, an EXIT trap now executes without the redirections.
Because of these changes, EV_EXIT can now be inherited by the body of a
function, so do so. This means that a function no longer prevents a fork
before an exec being skipped, such as in
f() { head -1 /etc/passwd; }; echo $(f)
Wrapping a single builtin in a function may still cause an otherwise
unnecessary fork with command substitution, however.
An exit command or -e failure still invokes the EXIT trap with the
original redirections and local variables in place.
Note: this depends on SHELLPROC being gone. A SHELLPROC depended on
keeping the redirections and local variables and only cleaning up the
state to restore them.
-rw-r--r-- | bin/sh/error.h | 1 | ||||
-rw-r--r-- | bin/sh/eval.c | 25 | ||||
-rw-r--r-- | bin/sh/main.c | 3 | ||||
-rw-r--r-- | tools/regression/bin/sh/execution/fork3.0 | 4 | ||||
-rw-r--r-- | tools/regression/bin/sh/execution/redir6.0 | 21 | ||||
-rw-r--r-- | tools/regression/bin/sh/execution/redir7.0 | 21 |
6 files changed, 62 insertions, 13 deletions
diff --git a/bin/sh/error.h b/bin/sh/error.h index a1d2b4f..d0a4bca 100644 --- a/bin/sh/error.h +++ b/bin/sh/error.h @@ -57,6 +57,7 @@ extern volatile sig_atomic_t exception; #define EXINT 0 /* SIGINT received */ #define EXERROR 1 /* a generic error */ #define EXEXEC 2 /* command execution failed */ +#define EXEXIT 3 /* call exitshell(exitstatus) */ /* diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 793248b..6f89041 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -179,7 +179,7 @@ evalstring(char *s, int flags) if (!any) exitstatus = 0; if (flags_exit) - exitshell(exitstatus); + exraise(EXEXIT); } @@ -285,8 +285,10 @@ evaltree(union node *n, int flags) out: if (pendingsigs) dotrap(); - if ((flags & EV_EXIT) || (eflag && exitstatus != 0 && do_etest)) + if (eflag && exitstatus != 0 && do_etest) exitshell(exitstatus); + if (flags & EV_EXIT) + exraise(EXEXIT); } @@ -440,8 +442,8 @@ evalredir(union node *n, int flags) handler = savehandler; e = exception; + popredir(); if (e == EXERROR || e == EXEXEC) { - popredir(); if (in_redirect) { exitstatus = 2; return; @@ -927,8 +929,7 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) if (setjmp(jmploc.loc)) { freeparam(&shellparam); shellparam = saveparam; - if (exception == EXERROR || exception == EXEXEC) - popredir(); + popredir(); unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; @@ -943,10 +944,8 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); exitstatus = oexitstatus; - if (flags & EV_TESTED) - evaltree(getfuncnode(cmdentry.u.func), EV_TESTED); - else - evaltree(getfuncnode(cmdentry.u.func), 0); + evaltree(getfuncnode(cmdentry.u.func), + flags & (EV_TESTED | EV_EXIT)); INTOFF; unreffunc(cmdentry.u.func); poplocalvars(); @@ -982,7 +981,10 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) savehandler = handler; if (setjmp(jmploc.loc)) { e = exception; - exitstatus = (e == EXINT)? SIGINT+128 : 2; + if (e == EXINT) + exitstatus = SIGINT+128; + else if (e != EXEXIT) + exitstatus = 2; goto cmddone; } handler = &jmploc; @@ -1018,8 +1020,7 @@ cmddone: backcmd->nleft = memout.nextc - memout.buf; memout.buf = NULL; } - if (cmdentry.u.index != EXECCMD && - (e == -1 || e == EXERROR || e == EXEXEC)) + if (cmdentry.u.index != EXECCMD) popredir(); if (e != -1) { if ((e != EXERROR && e != EXEXEC) diff --git a/bin/sh/main.c b/bin/sh/main.c index c5de899..12a7ff2 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -111,7 +111,8 @@ main(int argc, char *argv[]) break; } - if (state == 0 || iflag == 0 || ! rootshell) + if (state == 0 || iflag == 0 || ! rootshell || + exception == EXEXIT) exitshell(exitstatus); reset(); if (exception == EXINT) diff --git a/tools/regression/bin/sh/execution/fork3.0 b/tools/regression/bin/sh/execution/fork3.0 new file mode 100644 index 0000000..3cb678c --- /dev/null +++ b/tools/regression/bin/sh/execution/fork3.0 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +result=$(${SH} -c 'f() { ps -p $$ -o comm=; }; f') +test "$result" = "ps" diff --git a/tools/regression/bin/sh/execution/redir6.0 b/tools/regression/bin/sh/execution/redir6.0 new file mode 100644 index 0000000..4e3ac0c --- /dev/null +++ b/tools/regression/bin/sh/execution/redir6.0 @@ -0,0 +1,21 @@ +# $FreeBSD$ + +failures=0 + +check() { + if [ "$2" != "$3" ]; then + echo "Failure at $1" >&2 + failures=$((failures + 1)) + fi +} + +check $LINENO "$(trap "echo bye" EXIT; : >/dev/null)" bye +check $LINENO "$(trap "echo bye" EXIT; { :; } >/dev/null)" bye +check $LINENO "$(trap "echo bye" EXIT; (:) >/dev/null)" bye +check $LINENO "$(trap "echo bye" EXIT; (: >/dev/null))" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; : >/dev/null')" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; { :; } >/dev/null')" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; (:) >/dev/null')" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; (: >/dev/null)')" bye + +exit $((failures > 0)) diff --git a/tools/regression/bin/sh/execution/redir7.0 b/tools/regression/bin/sh/execution/redir7.0 new file mode 100644 index 0000000..2487bcf --- /dev/null +++ b/tools/regression/bin/sh/execution/redir7.0 @@ -0,0 +1,21 @@ +# $FreeBSD$ + +failures=0 + +check() { + if [ "$2" != "$3" ]; then + echo "Failure at $1" >&2 + failures=$((failures + 1)) + fi +} + +check $LINENO "$(trap "echo bye" EXIT; f() { :; }; f >/dev/null)" bye +check $LINENO "$(trap "echo bye" EXIT; f() { :; }; { f; } >/dev/null)" bye +check $LINENO "$(trap "echo bye" EXIT; f() { :; }; (f) >/dev/null)" bye +check $LINENO "$(trap "echo bye" EXIT; f() { :; }; (f >/dev/null))" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; f() { :; }; f >/dev/null')" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; f() { :; }; { f; } >/dev/null')" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; f() { :; }; (f) >/dev/null')" bye +check $LINENO "$(${SH} -c 'trap "echo bye" EXIT; f() { :; }; (f >/dev/null)')" bye + +exit $((failures > 0)) |