From nobody Mon Apr 06 16:52:24 2026 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 4fqFk33ZGmz6YL29 for ; Mon, 06 Apr 2026 16:52:27 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqFk01xCZz44PJ for ; Mon, 06 Apr 2026 16:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494344; 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=qBb+uN3+Pe3hEp8GeoI70bQ6guPZl9/u3YnSSihUq5M=; b=fSPbJlHG0+1tTKpH1lNUyFnRlN/PaZdlDHZB/rMYkqmjDxKvJn53eEdt0bARMLbcZcL+iD DB0C3qEzeYRodSb9+2dZ/oc/G0TVep9I3LMSaLtb+h2WK24xYc8XDti44CVK8tVsDJdlrw xta+p/LtlfCtjhLy9vVjChkfdVl7M7vAJsPYa8y9qsuf6wP7IAFsDI/m8Tke+QIN/nWJMI Ma/b8RF42Ze8cB7ah2cxtMJubqdGV+bc2iPz3GH2Fve3vKm4WSN54dIrFFGsDwm8gS6Zm7 CWg+fNvInNanh+QJJmRzuBqGnbKQqdbnI+9B1P+UpmSByshpWIYj8K6eGAskjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494344; a=rsa-sha256; cv=none; b=iwEnRB6YLQuApzBx5FAowMrfk9MHI36gT26EAplr82hvkZ+N+ptxHeVMfUaBsRkK8HDyk2 upmdTEJuIk9NXThPugBro7IvK3hNOaExga6AEKtqUV7W0JGTvgtGOnih4hoJez84qS8fmD BuzUWD5J6xW+sybu1H1y1n8vo4EpnXPmU0uczv8gtS1Ej+oUzbYx5cES77Q+j8Qsludl8v 62nfuf6QWirJszaK3qoO/LuEaNLfd7zIjFotNwm3mRF60MM0smBzJrm1846TVILtS5GUde 7jhMoThzhgPsk/V0dMW/dKERUEt5/mPOGn3R6DxExlMuKwszJwJojcbyG9cq/Q== 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=1775494344; 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=qBb+uN3+Pe3hEp8GeoI70bQ6guPZl9/u3YnSSihUq5M=; b=ZRJfRiGsM4PYfR+TMIiNvc66U1qLeHIsor4W51Hk5JnJYm6c9mfmotJQY3bfCi1YYFvT7W fvpAJE0lys+hk2+q19VnCkW/oOk6un6dI1Ve3q0oQN8Wg1NeTB8x6RkvxtV94uvaN1PXLs 0ZAC22TZJi9wxFFh1p+pAnSuBshIHNEKiSDUP3CTqUwCWJNjcihkka/M6B52t5cUc8x9XO Z3RAMG4uQ/sxvKZwklpvbflTKberHJMfFiz6wiQ9C6IZezrwh4sXcq/okQF+rz4Frcoo3f EpuXNpqhy/qG+f5ezyDukW0Bg21uIMbiI217uwEn5sr1wHNQcNVmzUZRR7Gtig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFk00zzCz129d for ; Mon, 06 Apr 2026 16:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bf96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f5d3d35273ea - stable/15 - diff: use O_CLOEXEC on pipes 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f5d3d35273ea58b120ea80d1222205c3d4f969ee Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:24 +0000 Message-Id: <69d3e4c8.1bf96.7681e967@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f5d3d35273ea58b120ea80d1222205c3d4f969ee commit f5d3d35273ea58b120ea80d1222205c3d4f969ee Author: Baptiste Daroussin AuthorDate: 2026-03-28 08:55:24 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff: use O_CLOEXEC on pipes This only simplifies the code, no functional changes expected MFC After: 1 week (cherry picked from commit c8d40bf8ecc60cc15e3904410db62065ea681fdc) --- usr.bin/diff/pr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index 51cf2c765283..e8a4162d8b18 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -61,7 +61,7 @@ start_pr(char *file1, char *file2) xasprintf(&header, "%s %s %s", diffargs, file1, file2); signal(SIGPIPE, SIG_IGN); fflush(stdout); - if (pipe(pfd) == -1) + if (pipe2(pfd, O_CLOEXEC) == -1) err(2, "pipe"); if ((error = posix_spawnattr_init(&sa)) != 0) @@ -71,11 +71,8 @@ start_pr(char *file1, char *file2) posix_spawnattr_setprocdescp_np(&sa, &pr->procd, 0); - if (pfd[0] != STDIN_FILENO) { + if (pfd[0] != STDIN_FILENO) posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO); - posix_spawn_file_actions_addclose(&fa, pfd[0]); - } - posix_spawn_file_actions_addclose(&fa, pfd[1]); char *argv[] = { __DECONST(char *, _PATH_PR), __DECONST(char *, "-h"), header, NULL };