From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8E50D1381F3 for ; Sun, 6 Oct 2013 17:36:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24DD3E0AA4; Sun, 6 Oct 2013 17:36:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6229E0AA4 for ; Sun, 6 Oct 2013 17:36:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9019433EF28 for ; Sun, 6 Oct 2013 17:36:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 43B68E5308 for ; Sun, 6 Oct 2013 17:36:19 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1381078837.82378bd92dc5569c1c06f291b6f3c048044baafa.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/start-stop-daemon.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 82378bd92dc5569c1c06f291b6f3c048044baafa X-VCS-Branch: master Date: Sun, 6 Oct 2013 17:36:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b8e0999c-d035-4713-8202-93adf75a6b43 X-Archives-Hash: bb8ccf8c3b4aae1ff1beaf6bfc5afcb9 commit: 82378bd92dc5569c1c06f291b6f3c048044baafa Author: William Hubbs gmail com> AuthorDate: Sat Oct 5 22:19:06 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Oct 6 17:00:37 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=82378bd9 start-stop-daemon: fix do_stop calls Several calls to do_stop were forcing the test parameter to be true, which was causing extra output to the terminal, such as: * Would send signal 0 to pid xxxxx This should only happen if the --test command line option was used. --- src/rc/start-stop-daemon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c index cceb041..cc47c0b 100644 --- a/src/rc/start-stop-daemon.c +++ b/src/rc/start-stop-daemon.c @@ -452,7 +452,7 @@ run_stop_schedule(const char *exec, const char *const *argv, nloops++) { if ((nrunning = do_stop(exec, argv, - pid, uid, 0, true)) == 0) + pid, uid, 0, test)) == 0) return 0; @@ -1075,7 +1075,7 @@ start_stop_daemon(int argc, char **argv) pid = 0; if (do_stop(exec, (const char * const *)margv, pid, uid, - 0, true) > 0) + 0, test) > 0) eerrorx("%s: %s is already running", applet, exec); if (test) { @@ -1352,7 +1352,7 @@ start_stop_daemon(int argc, char **argv) } else pid = 0; if (do_stop(exec, (const char *const *)margv, - pid, uid, 0, true) > 0) + pid, uid, 0, test) > 0) alive = true; }