summaryrefslogtreecommitdiffstats
path: root/bin/sh
diff options
context:
space:
mode:
authorcracauer <cracauer@FreeBSD.org>1998-02-06 23:50:39 +0000
committercracauer <cracauer@FreeBSD.org>1998-02-06 23:50:39 +0000
commitcc1e6a26112177e43c3f34ab8816a908f35cec54 (patch)
tree47284fab35d402c1d8195727905c67817879c97f /bin/sh
parent62746984d742c6cf6f97b1cbde18e6d922ea8966 (diff)
downloadFreeBSD-src-cc1e6a26112177e43c3f34ab8816a908f35cec54.zip
FreeBSD-src-cc1e6a26112177e43c3f34ab8816a908f35cec54.tar.gz
Back out my previous attempt to fix SIGINT/SIGTERM behaviour
Diffstat (limited to 'bin/sh')
-rw-r--r--bin/sh/jobs.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index a75fae0..0d58731 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -85,9 +85,6 @@ MKINIT pid_t backgndpid = -1; /* pid of last background process */
int initialpgrp; /* pgrp of shell on invocation */
int curjob; /* current job */
#endif
-sig_t oldsigint;
-sig_t oldsigquit;
-int oldsigs_valid = 0;
#if JOBS
STATIC void restartjob __P((struct job *));
@@ -577,11 +574,6 @@ forkshell(jp, n, mode)
TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n,
mode));
INTOFF;
- if (mode == FORK_FG) {
- oldsigquit = signal(SIGQUIT,SIG_IGN);
- oldsigint = signal(SIGINT,SIG_IGN);
- oldsigs_valid = 1;
- }
pid = fork();
if (pid == -1) {
TRACE(("Fork failed, errno=%d\n", errno));
@@ -594,8 +586,6 @@ forkshell(jp, n, mode)
int i;
TRACE(("Child shell %d\n", getpid()));
- signal(SIGQUIT,SIG_DFL);
- signal(SIGINT,SIG_DFL);
wasroot = rootshell;
rootshell = 0;
for (i = njobs, p = jobtab ; --i >= 0 ; p++)
@@ -710,12 +700,6 @@ waitforjob(jp)
while (jp->state == 0) {
dowait(1, jp);
}
- if (oldsigs_valid) {
- signal(SIGQUIT,oldsigquit);
- signal(SIGINT,oldsigint);
- oldsigs_valid = 0;
- }
-
#if JOBS
if (jp->jobctl) {
#ifdef OLD_TTY_DRIVER
OpenPOWER on IntegriCloud