From nobody Mon Jun 16 08:53:56 2025 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 4bLP1c5jphz5Vpnr; Mon, 16 Jun 2025 08:53:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLP1c2CD2z3wDw; Mon, 16 Jun 2025 08:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064036; 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=R3aNtp5qQMmYWIrZHaytHUzl1PGS/tRnfztkds8h1WQ=; b=aq9zfQJ7ScC4H0mgbCIv92U/NSLS8N5xyJijDnUE4HRKqgz4fY3q88LgWmSbtOuaekCzb0 pgSwt/57KNh1bFwaNUBKdfQ8y0MasanqmQDBPJ78XahU0S+egG9bEvtAmyt58mGXgalXHY A3z7J5cOFVyCWK0/eLLIcCsxu/1R87yvoz8lRD5J4j0pQ3CwRMM6aryzp/bxbTP1jwVQno 3PM8RfTkE44cVHqFmPbNfSy/qvb4umzwr7IfgCkZsgCuQWC+t70iPyxiILoVQ8F7fFXPtk oUQRFctoPjeux9NAeONBqsRGPo8U94DxpxDgZw8VTY7ItTEYfoNY/oATZoqpmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064036; 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=R3aNtp5qQMmYWIrZHaytHUzl1PGS/tRnfztkds8h1WQ=; b=JORQmUuHg/YIfvoRTTXd5B6aWjvFNwq71HsRTV/t7HAhAP3vpGZaihDhs/TEeOBpoeWNJ8 y0F07ufkQFc1C0KCuFbM627fBb9gQ3bwJY954yR7Gt47Y8VqiD4FU2nQvN6tAf/0gsV7bl pzhW5RQ7R/gNiQNrOS8kQ9nDzif1Kl6ZsS1/ktQDIgHcWK8dhjqyJn+q9UpJ2wYYe61U4H l3mD9Hg0htxx3Q9RvO133Qzrhxq21e0FHJRbtnuK/ljj/gIt1U60Y+drCxGadmbyPjY2N2 MIFwa2QBHURSGkU4k5PS6DKTa+EOhPT6QLBGJASc/q3tfgCBCyDYab6EgVWhsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750064036; a=rsa-sha256; cv=none; b=x6PVjUsm95wYgGwIIFGuUC6Pxk4QNX0PiISiZN3kpY4MfvikMhZK5EKwN569yW2NXiIQbr /brcfjLtFYys5RbpqLReVOvt/phmyZ0IPCnoBzot+ieOc0fBWbx1VPmndew5ITTKBLpxGx i/3Brshl27EZoYUR/BVkUPZNq9PerqXcG2p94gbhLNWU39um/LT3VrDFPBvDMIYylC3XrK ykAQecyAsGLlziiZQU6Np1QZRhLsZIsHPgrpgeFV6bfrLmITdmtTSO3/X+pN4UB1QdXemp KD5z7Y8Wx8NI8AYshTPoxft+1Iup7gmW3KeaLT83Upyfi1z84XrByiD2NquhNQ== 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 4bLP1c1bl2zrqj; Mon, 16 Jun 2025 08:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55G8ruCq043062; Mon, 16 Jun 2025 08:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8ruS1043059; Mon, 16 Jun 2025 08:53:56 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:53:56 GMT Message-Id: <202506160853.55G8ruS1043059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d9e4b110fe91 - stable/14 - timeout(1): Use _exit(2) instead of err() in child if exec failed 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9e4b110fe919c1e96ba3bd5fdba177f03d365c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d9e4b110fe919c1e96ba3bd5fdba177f03d365c5 commit d9e4b110fe919c1e96ba3bd5fdba177f03d365c5 Author: Aaron LI AuthorDate: 2025-04-02 11:23:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 08:51:51 +0000 timeout(1): Use _exit(2) instead of err() in child if exec failed (cherry picked from commit 35503fe28eb51ef606cf4ae077a96b3c717199d3) --- bin/timeout/timeout.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 83893ba0a601..1817ef24995f 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -178,7 +178,7 @@ main(int argc, char **argv) { int ch; int foreground, preserve; - int error, pstat, status; + int pstat, status; int killsig = SIGTERM; size_t i; pid_t pid, cpid; @@ -280,13 +280,9 @@ main(int argc, char **argv) signal(SIGTTIN, SIG_DFL); signal(SIGTTOU, SIG_DFL); - error = execvp(argv[0], argv); - if (error == -1) { - if (errno == ENOENT) - err(EXIT_CMD_NOENT, "exec(%s)", argv[0]); - else - err(EXIT_CMD_ERROR, "exec(%s)", argv[0]); - } + execvp(argv[0], argv); + warn("exec(%s)", argv[0]); + _exit(errno == ENOENT ? EXIT_CMD_NOENT : EXIT_CMD_ERROR); } if (sigprocmask(SIG_BLOCK, &signals.sa_mask, NULL) == -1)