From nobody Wed Apr 16 19:46:25 2025 X-Original-To: dev-commits-src-main@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 4ZdBNf1nrHz5t8g7; Wed, 16 Apr 2025 19:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdBNf0gmpz3kq5; Wed, 16 Apr 2025 19:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744832786; 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=9gxukZtLlmpFGdTlW/v4kHHitJ0lWxnZs2m1856vuhQ=; b=bfAW9yPVxZDYJXfOxVyDPUXcISITlmiQ5g5WxXS3Gv7044BCUnVNEmyAn4qnYkSiowm7Ra 72270UMr8C7rR/VGJrHcr3YyT4mYugEUPZImR+Mb5WVS2TmSbXnwjxgYyum+ZiNX/FDRit Sg2o92Prr+uorAEGYSeTiIOowdzSAYeq64o0miUIau/+mzkWbGnRRsUGkIXEsPNA4Bns5x Vbff+3yJ+bkFBdarXJDtk2tqH6Xr5Pg/UL3uUhctaWgw/j/WtPA7Wf7bEFV7+gG/gtYpna aSfgTYq3qVSgceYl+7ANrZRmZyx2anHaaM7shyw3QOO4MQOaUAxlHxhWjhZCXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744832786; a=rsa-sha256; cv=none; b=rTLr2k8Y7WhHDN9RqVI4cfAeA2BPXzSVGwJ1Mh36U9AWd0ppGAV1WMQ9qCLUXe+y7lT0cB 34r7saLeD3nWlred1Mu0vKM/vEIIgsUJSkh4M0l29+TbUmnNNYPgxeP+HHUhZ0WEilkpbV kJ2Uikh5gPFbx2HfoENdoHlF9p2k3cMDSAH2ZvMpGbDnd7USIKNlZkt4tjkGqaOqHmilYe bDOFHs9/kq0l8OjVrouzcBhQx0Shb1O8jl4Ic5YzqsU+ZNktjKOx24UdsS0LQAJ6/N6cbc FKkczdyD+KYWruwmZDOfHyvOrJG3hLj5TYK17/VuEo/NrY7yHcz4fGQctFJHDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744832786; 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=9gxukZtLlmpFGdTlW/v4kHHitJ0lWxnZs2m1856vuhQ=; b=kzJJyHoMPSGIypvO5JJWKGt3IL7aRfgxUIedK0Kidj/+QLM9kOaQoqrwghZfFqvHz5uNja UuKmqm2Xwg9hnAfkY/qOD8/bJM6cEz7y90QdwovgeNJU5Hk4T/ldMsYuA0ZK4yLVLOHcpU yrc/bMjpTxLQa10P16ZZFb/mDwvADP1sENwonfzaapgq9eXj5pWbFvHOIcoF8loaZFUS7k nKdMY2xRxSkflTlqy1cwX6v6mzUMvvZSnHJrL6DTNMWLRgXYrSKArDFfyffnfaxC71jvCV l26gLrHpg+frMztesiCK9+3CrHnp2ZBVl6cvE5D+Tn8/dMQz43hLANwMYve/Fw== 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 4ZdBNd6r1Pz1tF; Wed, 16 Apr 2025 19:46:25 +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 53GJkPl3063570; Wed, 16 Apr 2025 19:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53GJkP04063567; Wed, 16 Apr 2025 19:46:25 GMT (envelope-from git) Date: Wed, 16 Apr 2025 19:46:25 GMT Message-Id: <202504161946.53GJkP04063567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 35503fe28eb5 - main - timeout(1): Use _exit(2) instead of err() in child if exec failed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35503fe28eb51ef606cf4ae077a96b3c717199d3 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=35503fe28eb51ef606cf4ae077a96b3c717199d3 commit 35503fe28eb51ef606cf4ae077a96b3c717199d3 Author: Aaron LI AuthorDate: 2025-04-02 11:23:06 +0000 Commit: Baptiste Daroussin CommitDate: 2025-04-16 19:45:38 +0000 timeout(1): Use _exit(2) instead of err() in child if exec failed * The child should _exit(2) instead of calling exit(3) via err(3) if the execvp() failed. * execvp(2) does not return except on error, so there is no need to check if the return value is -1. Obtained-from: OpenBSD (via DragonFly BSD) --- 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)