diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-07-20 11:14:48 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-16 10:13:01 +0200 |
| commit | 10ca952061a7fc8581b194678700e15a8e1a53e4 (patch) | |
| tree | 4bbbe61c04e1ae406479d53690315ecfb69e5a3c /src/basic/process-util.c | |
| parent | da22b4dccb157393d36cfce6656ddbd9f224f5e3 (diff) | |
util: don't send SIGCONT following a SIGCONT or SIGKILL in kill_and_sigcont()
Diffstat (limited to 'src/basic/process-util.c')
| -rw-r--r-- | src/basic/process-util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 291252979..c976f1f68 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -631,8 +631,10 @@ int kill_and_sigcont(pid_t pid, int sig) { r = kill(pid, sig) < 0 ? -errno : 0; - if (r >= 0) - kill(pid, SIGCONT); + /* If this worked, also send SIGCONT, unless we already just sent a SIGCONT, or SIGKILL was sent which isn't + * affected by a process being suspended anyway. */ + if (r >= 0 && !IN_SET(SIGCONT, SIGKILL)) + (void) kill(pid, SIGCONT); return r; } |