summaryrefslogtreecommitdiffstats
path: root/bin/sh/eval.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-11-12 18:35:06 +0000
committerpeter <peter@FreeBSD.org>1996-11-12 18:35:06 +0000
commit5ec5b278418b78568f09c6a94337772583138d97 (patch)
treebb717ebc6ea2b47258aef3c71433921875215110 /bin/sh/eval.c
parent80d0490b8edda41215648fb110638ea5db249e5e (diff)
downloadFreeBSD-src-5ec5b278418b78568f09c6a94337772583138d97.zip
FreeBSD-src-5ec5b278418b78568f09c6a94337772583138d97.tar.gz
Back out rev 1.7 which was to fix PR#1206 (to be reopened).
This patch causes too many side effects, one of which bites hard is when interrupting a 'make fetch' in the ports tree (PR#1990). This whole area is a real can of worms.... This most definately should go into 2.2 Reviewed by: steve, bde
Diffstat (limited to 'bin/sh/eval.c')
-rw-r--r--bin/sh/eval.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index c5bb7d4..a74b6ca 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: eval.c,v 1.6 1996/10/06 15:17:19 steve Exp $
+ * $Id: eval.c,v 1.7 1996/10/22 03:02:07 steve Exp $
*/
#ifndef lint
@@ -854,24 +854,7 @@ cmddone:
parent: /* parent process gets here (if we forked) */
if (mode == 0) { /* argument to fork */
INTOFF;
- if (minusc) {
- struct sigaction iact, qact, oiact, oqact;
-
- (void)sigaction(SIGINT, (struct sigaction *)NULL, &oiact);
- (void)sigaction(SIGQUIT, (struct sigaction *)NULL, &oqact);
-
- iact = oiact;
- qact = oqact;
-
- qact.sa_handler = iact.sa_handler = SIG_IGN;
-
- (void)sigaction(SIGINT, &iact, (struct sigaction *)NULL);
- (void)sigaction(SIGQUIT, &qact, (struct sigaction *)NULL);
- exitstatus = waitforjob(jp);
- (void)sigaction(SIGINT, &oiact, (struct sigaction *)NULL);
- (void)sigaction(SIGQUIT, &oqact, (struct sigaction *)NULL);
- } else
- exitstatus = waitforjob(jp);
+ exitstatus = waitforjob(jp);
INTON;
} else if (mode == 2) {
backcmd->fd = pip[0];
OpenPOWER on IntegriCloud