diff options
| author | Rostislav Skudnov | 2016-09-16 19:04:02 +0000 |
|---|---|---|
| committer | Denys Vlasenko | 2016-09-17 23:28:23 +0200 |
| commit | 204c7fb2293f67f6277f917e854188f5540e6955 (patch) | |
| tree | 20a880dd638d368d1e3a3cefd75f4756e66a04b3 | |
| parent | b157eb13cbc55338a3b82343c1cb2960af82cd17 (diff) | |
| download | busybox-204c7fb2293f67f6277f917e854188f5540e6955.zip busybox-204c7fb2293f67f6277f917e854188f5540e6955.tar.gz | |
ash: exit after subshell error when errexit option is set
When "set -e" option is on, shell must exit when any command fails,
including compound commands of the form (compound-list) executed in a
subshell. Bash and dash shells have this behaviour.
Also add a corresponding testcase.
Signed-off-by: Rostislav Skudnov <rostislav@tuxera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/ash.c | 2 | ||||
| -rw-r--r-- | shell/ash_test/ash-misc/errexit1.right | 1 | ||||
| -rwxr-xr-x | shell/ash_test/ash-misc/errexit1.tests | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c index bffb4a2..a885514 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -8408,6 +8408,8 @@ evaltree(union node *n, int flags) evalfn = evalloop; goto calleval; case NSUBSHELL: + evalfn = evalsubshell; + goto checkexit; case NBACKGND: evalfn = evalsubshell; goto calleval; diff --git a/shell/ash_test/ash-misc/errexit1.right b/shell/ash_test/ash-misc/errexit1.right new file mode 100644 index 0000000..d86bac9 --- /dev/null +++ b/shell/ash_test/ash-misc/errexit1.right @@ -0,0 +1 @@ +OK diff --git a/shell/ash_test/ash-misc/errexit1.tests b/shell/ash_test/ash-misc/errexit1.tests new file mode 100755 index 0000000..7b4a156 --- /dev/null +++ b/shell/ash_test/ash-misc/errexit1.tests @@ -0,0 +1,5 @@ +set -e +(true) +echo OK +(false) +echo FAIL |