From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 4 Apr 2011 00:03:35 +0000 (+0200)
Subject: start-stop-daemon: fix "-K --test --pidfile PIDFILE" exitcode
X-Git-Tag: 1_19_0~194
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=929f63e57cadb22905411f212809c14b160ec494;p=oweals%2Fbusybox.git

start-stop-daemon: fix "-K --test --pidfile PIDFILE" exitcode

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

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) {