aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRostislav Skudnov <rostislav@tuxera.com>2016-09-16 19:04:02 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2016-09-17 23:28:23 +0200
commit204c7fb2293f67f6277f917e854188f5540e6955 (patch)
tree20a880dd638d368d1e3a3cefd75f4756e66a04b3 /shell
parentb157eb13cbc55338a3b82343c1cb2960af82cd17 (diff)
downloadbusybox-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>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
-rw-r--r--shell/ash_test/ash-misc/errexit1.right1
-rwxr-xr-xshell/ash_test/ash-misc/errexit1.tests5
3 files changed, 8 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c
index bffb4a245..a885514d3 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 000000000..d86bac9de
--- /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 000000000..7b4a15634
--- /dev/null
+++ b/shell/ash_test/ash-misc/errexit1.tests
@@ -0,0 +1,5 @@
+set -e
+(true)
+echo OK
+(false)
+echo FAIL