From nobody Fri Mar 3 05:17:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PSbnf371Mz3whPY; Fri, 3 Mar 2023 05:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSbnf1KpRz3lLn; Fri, 3 Mar 2023 05:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W++qDbUWdb8Y2gANtzWap8/1rE/WJUciMnyVERaWRlA=; b=e5xX+zKGuCKyjYfIbefccOz3pzFX3AanSLCIfYOIaWDHY86tMuUkA/1nfGZnQsLaEIuhB6 8CWH1inhLuSxE1RzMsiPxfnTRZ0gbK/9Ov3gqpRAIMEZUGtp2FvwfSaHF8fwTa6Ltw2lx0 nh41Kh3K5ZEgM7X2LberUj8up2wkwOg6oLEZYyyHuUpREoA2nI2x5XoaXXO+41Nw/JQInq CVcePVV/mfOiypmzIRkjmVjh2YBFKTraan/NzQVEJqPuy48Js2n3S6+75N8EVVkNZBCPwx TTmCdJZa/jnnbQPf5+7XFMnjzCtpZuvDyVR8LxxqdEJAwK7a9tBfqluBuY618w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677820646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W++qDbUWdb8Y2gANtzWap8/1rE/WJUciMnyVERaWRlA=; b=AQzPpLcDdVflfzzb34htQNLMDafqvqx4m1WKUiaUlt1G/U9IZFnxW7lDUwVxw4GLHJdLkT +vkQWPy8A69/aEJFqFfo5JymTq67axBmODFiWu4wT2KOxYsKjCBII9Wtpi6aQgEi+ANV1q BBBtm5bNatn5sVl+yZswnQHVr9xhLhzyVNtnq2Tz02fOXccMChawAuzbB4eOzaCxWEyBQ9 lXDPg4L/eaYRvrks6zJdBP/3AYt3tt/CPoON3xVJt/bGm6xAdfv6MWU2QrvXr1y3RA9Mul m+B6Raw4Q0QHotivuZz4BAE6kuZm16PQVqfICbAj3XC4Jm3XTRmPOYk563siwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677820646; a=rsa-sha256; cv=none; b=BepkfTlDWgFYjCG1tNTMHjbPOMuyl+1hUM6+1XxXAQTpYwz4nRlwF1ewNJZ89iGxeI6ZH7 dATsroPXjsNQVo/WDsyKCCNk5G+Sa0KptchT7c3cIZCwlFDK/PPujDpfze/N7IpJcJi2iv nzoYIitPjx1gMakm6gbywCZWesMzRKjXMBsWSyQBNVk+XzYplYa6OlAp7EErOXaw89z/hS 88AHkd8MNSTcFuLna3d0NWDj5IANL8Bq6Ohu3FWbpKeT1rSKGMODDNW+9RapASIVKZ352C nC3r+q4Vg65aqojN8qM7hkibeyhZ/VmgWLLHgAPlcGE2Dr/laCgzfSVElul/+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSbnf0Rq4zlHp; Fri, 3 Mar 2023 05:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3235HP6t019649; Fri, 3 Mar 2023 05:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3235HPPa019648; Fri, 3 Mar 2023 05:17:25 GMT (envelope-from git) Date: Fri, 3 Mar 2023 05:17:25 GMT Message-Id: <202303030517.3235HPPa019648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: cd1e6e70d001 - main - daemon: simplify if/else chain List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd1e6e70d001bea9e9e0220bdfdbd8b5dd9922de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=cd1e6e70d001bea9e9e0220bdfdbd8b5dd9922de commit cd1e6e70d001bea9e9e0220bdfdbd8b5dd9922de Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-03 05:17:02 +0000 daemon: simplify if/else chain Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 --- usr.sbin/daemon/daemon.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 5c636bcd0a03..2274a3e253a0 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -452,22 +452,16 @@ restart: */ if (child_gone && child_eof) { break; - } else if (terminate) { + } + + if (terminate) { goto exit; - } else if (!child_eof) { - if (sigprocmask(SIG_BLOCK, &mask_read, NULL)) { - warn("sigprocmask"); - goto exit; - } - child_eof = !listen_child(pfd[0], &logparams); - if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { - warn("sigprocmask"); - goto exit; - } - } else { + } + + if (child_eof) { if (sigprocmask(SIG_BLOCK, &mask_susp, NULL)) { warn("sigprocmask"); - goto exit; + goto exit; } while (!terminate && !child_gone) sigsuspend(&mask_orig); @@ -475,7 +469,21 @@ restart: warn("sigprocmask"); goto exit; } + continue; + } + + if (sigprocmask(SIG_BLOCK, &mask_read, NULL)) { + warn("sigprocmask"); + goto exit; } + + child_eof = !listen_child(pfd[0], &logparams); + + if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { + warn("sigprocmask"); + goto exit; + } + } if (restart && !terminate) { daemon_sleep(restart, 0);