diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-08 14:39:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-08 14:39:05 +0100 |
| commit | 76ab4fd61901090e6af3451ca6c5ca0fc370571f (patch) | |
| tree | 793cb4cb12282655e89396531f11f6e09e119c72 /src | |
| parent | 446e7a3cd36b2de7d559f167eb5795d1e1cd3ddb (diff) | |
| download | vim-git-76ab4fd61901090e6af3451ca6c5ca0fc370571f.tar.gz | |
patch 8.1.0572: stopping a job does not work properly on OpenBSDv8.1.0572
Problem: Stopping a job does not work properly on OpenBSD.
Solution: Do not use getpgid() to check the process group of the job
processs ID, always pass the negative process ID to kill().
(George Koehler, closes #3656)
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 4d902d939..ecb348c4d 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5820,7 +5820,6 @@ mch_detect_ended_job(job_T *job_list) mch_signal_job(job_T *job, char_u *how) { int sig = -1; - pid_t job_pid; if (*how == NUL || STRCMP(how, "term") == 0) sig = SIGTERM; @@ -5841,16 +5840,13 @@ mch_signal_job(job_T *job, char_u *how) else return FAIL; - /* TODO: have an option to only kill the process, not the group? */ - job_pid = job->jv_pid; -#ifdef HAVE_GETPGID - if (job_pid == getpgid(job_pid)) - job_pid = -job_pid; -#endif - - /* Never kill ourselves! */ - if (job_pid != 0) - kill(job_pid, sig); + // Never kill ourselves! + if (job->jv_pid != 0) + { + // TODO: have an option to only kill the process, not the group? + kill(-job->jv_pid, sig); + kill(job->jv_pid, sig); + } return OK; } diff --git a/src/version.c b/src/version.c index 049f34b81..9311bc50a 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 572, +/**/ 571, /**/ 570, |