diff options
author | cracauer <cracauer@FreeBSD.org> | 1998-08-24 10:17:20 +0000 |
---|---|---|
committer | cracauer <cracauer@FreeBSD.org> | 1998-08-24 10:17:20 +0000 |
commit | f3d290b0b53aa55bf027aba6c54dd0e5b1d101f3 (patch) | |
tree | f26bf7d06a6acaf0ba2829e55a588da97f3ea4a7 /usr.bin/make | |
parent | 5112766b07ec301856c63e772236ab606ccb7942 (diff) | |
download | FreeBSD-src-f3d290b0b53aa55bf027aba6c54dd0e5b1d101f3.zip FreeBSD-src-f3d290b0b53aa55bf027aba6c54dd0e5b1d101f3.tar.gz |
When exiting on SIGINT, exit with signal status
Diffstat (limited to 'usr.bin/make')
-rw-r--r-- | usr.bin/make/compat.c | 7 | ||||
-rw-r--r-- | usr.bin/make/job.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c index ce156cf..bff02c8 100644 --- a/usr.bin/make/compat.c +++ b/usr.bin/make/compat.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: compat.c,v 1.9 1998/05/12 11:54:12 wosch Exp $ + * $Id: compat.c,v 1.10 1998/05/13 05:50:42 jb Exp $ */ #ifndef lint @@ -129,7 +129,10 @@ CompatInterrupt (signo) } } - exit (signo); + if (signo == SIGQUIT) + exit(signo); + (void) signal(signo, SIG_DFL); + (void) kill(getpid(), signo); } /*- diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 0b06d74..d7451fc 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: job.c,v 1.8 1998/04/28 05:08:10 imp Exp $ + * $Id: job.c,v 1.9 1998/06/04 05:48:57 bde Exp $ */ #ifndef lint @@ -399,7 +399,7 @@ JobPassSig(signo) * Leave gracefully if SIGQUIT, rather than core dumping. */ if (signo == SIGQUIT) { - Finish(0); + signo = SIGINT; } /* @@ -2914,7 +2914,6 @@ JobInterrupt(runINTERRUPT, signo) } } (void) eunlink(tfile); - exit(signo); } /* |