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>

diff --git a/shell/ash.c b/shell/ash.c
index bffb4a245f1c3426e066522238a86bb8612bc22d..a885514d3f904348c68222f53c7e27586c0accb3 100644 (file)
--- 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 (file)
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 (executable)
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