diff options
| author |   espie <espie@openbsd.org> | 2020-06-02 12:24:09 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2020-06-02 12:24:09 +0000 |
| commit | 6a00fc0c76d345e412471155816d2aae69a53d63 (patch) | |
| tree | b3b2f8f0d35dfbdff95f70b6d6ea40dcdf1b3f7d /usr.bin/make | |
| parent | Fail rather than fatal on UTF-8 width 0. (diff) | |
| download | wireguard-openbsd-6a00fc0c76d345e412471155816d2aae69a53d63.tar.xz wireguard-openbsd-6a00fc0c76d345e412471155816d2aae69a53d63.zip | |
use the right abstraction to abort jobs, also show debug info as this
thing is tricky
okay millert@
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/job.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 329ff3037c2..c3ac2d6b28b 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -1,4 +1,4 @@ -/* $OpenBSD: job.c,v 1.160 2020/01/29 17:06:51 espie Exp $ */ +/* $OpenBSD: job.c,v 1.161 2020/06/02 12:24:09 espie Exp $ */ /* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */ /* @@ -946,8 +946,12 @@ Job_AbortAll(void) aborting = ABORT_ERROR; for (job = runningJobs; job != NULL; job = job->next) { - killpg(job->pid, SIGINT); - killpg(job->pid, SIGKILL); + debug_kill_printf("abort: send SIGINT to " + "child %ld running %s: %s\n", + (long)job->pid, job->node->name, really_kill(job, SIGINT)); + debug_kill_printf("abort: send SIGKILL to " + "child %ld running %s: %s\n", + (long)job->pid, job->node->name, really_kill(job, SIGKILL)); } /* |