summary refs log tree commit diff
path: root/src/error.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/error.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/error.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/error.c b/src/error.c
index 7f165c1..e304d3d 100644
--- a/src/error.c
+++ b/src/error.c
@@ -51,7 +51,6 @@
 #include "show.h"
 #include "eval.h"
 #include "parser.h"
-#include "trap.h"
 #include "system.h"
 
 
@@ -98,19 +97,14 @@ exraise(int e)
 
 void
 onint(void) {
-	int i;
 
 	intpending = 0;
 	sigclearmask();
-	i = EXSIG;
-	if (gotsig[SIGINT - 1] && !trap[SIGINT]) {
-		if (!(rootshell && iflag)) {
-			signal(SIGINT, SIG_DFL);
-			raise(SIGINT);
-		}
-		i = EXINT;
+	if (!(rootshell && iflag)) {
+		signal(SIGINT, SIG_DFL);
+		raise(SIGINT);
 	}
-	exraise(i);
+	exraise(EXINT);
 	/* NOTREACHED */
 }