chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
60b2585
)
Fix check for signal in set (#5416)
author
stuart-mclaren
<stuart.mclaren@hp.com>
Tue, 21 Feb 2017 20:39:52 +0000
(20:39 +0000)
committer
Sven Eden
<yamakuzure@gmx.net>
Mon, 17 Jul 2017 15:58:36 +0000
(17:58 +0200)
IN_SET(SIGCONT, SIGKILL) will always evaluate to false.
The signal needs to be included as the first argument.
Fixup for
26f417d3e8dd2522adfdc4c8fed4c36fa40f48fc
.
src/basic/process-util.c
patch
|
blob
|
history
diff --git
a/src/basic/process-util.c
b/src/basic/process-util.c
index a5f355c10d567e87de29d9208e4c6e30f94e3481..8ced76a897c2375b4af9ac4d5acfa499ce9bc63b 100644
(file)
--- a/
src/basic/process-util.c
+++ b/
src/basic/process-util.c
@@
-708,7
+708,7
@@
int kill_and_sigcont(pid_t pid, int sig) {
/* 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))
+ if (r >= 0 && !IN_SET(
sig,
SIGCONT, SIGKILL))
(void) kill(pid, SIGCONT);
return r;