summary refs log tree commit diff
diff options
context:
space:
mode:
authorherbert <herbert@gondor.apana.org.au>2005-03-28 17:53:55 +1000
committerHerbert Xu <herbert@gondor.apana.org.au>2005-09-26 18:33:05 +1000
commit27232a8d36f5c5576cdfecd65ce12d29bdfd2f9d (patch)
treef229961f10d27fde213aafa8c1c64f38b1590447
parentHandle SKIPEVAL in read_profile by exiting. (diff)
downloaddash-27232a8d36f5c5576cdfecd65ce12d29bdfd2f9d.tar.gz
dash-27232a8d36f5c5576cdfecd65ce12d29bdfd2f9d.zip
Let evaltree handle traps from cmdloop.
Diffstat (limited to '')
-rw-r--r--ChangeLog1
-rw-r--r--src/main.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 66952e3..a161d22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	* Removed unnecessary inclusion of main.h from eval.c.
 	* Generalise setinputfile for use in read_profile/readcmdfile.
 	* Handle SKIPEVAL in read_profile by exiting.
+	* Let evaltree handle traps from cmdloop.
 
 2005-03-25  Gerrit Pape <pape@smarden.org>
 
diff --git a/src/main.c b/src/main.c
index 489599d..fd13ab2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -231,8 +231,6 @@ cmdloop(int top)
 		int skip;
 
 		setstackmark(&smark);
-		if (pendingsigs)
-			dotrap();
 		if (jobctl)
 			showjobs(out2, SHOW_CHANGED);
 		inter = 0;
@@ -251,7 +249,7 @@ cmdloop(int top)
 				out2str("\nUse \"exit\" to leave shell.\n");
 			}
 			numeof++;
-		} else if (n != NULL && nflag == 0) {
+		} else if (nflag == 0) {
 			job_warning = (job_warning == 2) ? 1 : 0;
 			numeof = 0;
 			evaltree(n, 0);