summary refs log tree commit diff
path: root/src/eval.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-02-22 18:16:13 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2009-02-22 18:16:13 +0800
commited25e9f97e007f684146f729bb5cdeaf91b668b6 (patch)
tree60258db17efbd43ac0639f4310097ab8fee63eeb /src/eval.c
parent[JOBS] Fix dowait signal race (diff)
downloaddash-ed25e9f97e007f684146f729bb5cdeaf91b668b6.tar.gz
dash-ed25e9f97e007f684146f729bb5cdeaf91b668b6.zip
[SIGNAL] Remove EXSIG
Now that waitcmd no longer uses EXSIG we can remove it.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r--src/eval.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/eval.c b/src/eval.c
index 0b449ee..b90a354 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -863,20 +863,13 @@ bail:
 		}
 		if (evalbltin(cmdentry.u.cmd, argc, argv)) {
 			int status;
-			int i, j;
+			int i;
 
 			i = exception;
 			if (i == EXEXIT)
 				goto raise;
 
-			status = 2;
-			j = 0;
-			if (i == EXINT)
-				j = SIGINT;
-			if (i == EXSIG)
-				j = pendingsigs;
-			if (j)
-				status = j + 128;
+			status = (i == EXINT) ? SIGINT + 128 : 2;
 			exitstatus = status;
 
 			if (i == EXINT || spclbltin > 0) {
@@ -926,7 +919,6 @@ cmddone:
 	exitstatus |= outerr(out1);
 	freestdout();
 	commandname = savecmdname;
-	exsig = 0;
 	handler = savehandler;
 
 	return i;