summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-04-04 00:03:35 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-04-04 00:03:35 (GMT)
commit929f63e57cadb22905411f212809c14b160ec494 (patch)
treeea12736cdf8264c81ded5f26ff8ee4f3fd0a990f
parent6a3e01d5a9f979f7d6e52665c2bf6c74e2592980 (diff)
downloadbusybox-929f63e57cadb22905411f212809c14b160ec494.tar.gz
busybox-929f63e57cadb22905411f212809c14b160ec494.tar.bz2
start-stop-daemon: fix "-K --test --pidfile PIDFILE" exitcode
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--debianutils/start_stop_daemon.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 30dd970..bc61959 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -337,11 +337,17 @@ static int do_stop(void)
goto ret;
}
for (p = G.found_procs; p; p = p->next) {
- if (TEST || kill(p->pid, signal_nr) == 0) {
+ if (kill(p->pid, TEST ? 0 : signal_nr) == 0) {
killed++;
} else {
- p->pid = 0;
bb_perror_msg("warning: killing process %u", (unsigned)p->pid);
+ p->pid = 0;
+ if (TEST) {
+ /* Example: -K --test --pidfile PIDFILE detected
+ * that PIDFILE's pid doesn't exist */
+ killed = -1;
+ goto ret;
+ }
}
}
if (!QUIET && killed) {