ea7d2f6ec

Ron Yorston

2017-01-03

SUCCESS Duration: 214s

Subject

ash: fix error code regression

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

shell/ash.c+6 -2

@@ -1284,6 +1284,8 @@ ash_msg_and_raise_error(const char *msg, ...)
	{
	va_list ap;

+	exitstatus = 2;
+
	va_start(ap, msg);
	ash_vmsg_and_raise(EXERROR, msg, ap);
	/* NOTREACHED */
@@ -9588,11 +9590,13 @@ evalcommand(union node *cmd, int flags)
	}

	if (status) {
+	bail:
+	exitstatus = status;
+
	/* We have a redirection error. */
	if (spclbltin > 0)
	raise_exception(EXERROR);
-	bail:
-	exitstatus = status;
+
	goto out;
	}

shell/ash_test/ash-misc/exitcode2.right+4 -0

@@ -0,0 +1,4 @@
+	./test.sh: line 1: syntax error: unexpected ")"
+	Done:2
+	./exitcode2.tests: line 11: can't open does_not_exist: no such file
+	Done:1

shell/ash_test/ash-misc/exitcode2.tests+12 -0

@@ -0,0 +1,12 @@
+	# syntax error should return status 2
+	cat >test.sh <<EOF
+	)
+	EOF
+	chmod +x test.sh
+	$THIS_SH ./test.sh
+	echo Done:$?
+	rm -f test.sh
+
+	# redirection error with special builtin should return status 1
+	(eval cat <does_not_exist)
+	echo Done:$?

shell/hush_test/hush-misc/exitcode2.right+4 -0

@@ -0,0 +1,4 @@
+	hush: syntax error: unexpected )
+	Done:2
+	hush: can't open 'does_not_exist': No such file or directory
+	Done:1

shell/hush_test/hush-misc/exitcode2.tests+12 -0

@@ -0,0 +1,12 @@
+	# syntax error should return status 2
+	cat >test.sh <<EOF
+	)
+	EOF
+	chmod +x test.sh
+	$THIS_SH ./test.sh
+	echo Done:$?
+	rm -f test.sh
+
+	# redirection error with special builtin should return status 1
+	(eval cat <does_not_exist)
+	echo Done:$?