From 929f63e57cadb22905411f212809c14b160ec494 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 4 Apr 2011 02:03:35 +0200 Subject: start-stop-daemon: fix "-K --test --pidfile PIDFILE" exitcode Signed-off-by: Denys Vlasenko --- debianutils/start_stop_daemon.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 30dd9709d..bc61959d2 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) { -- cgit v1.2.3