From nobody Sat Mar 28 08:56:36 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 4fjWb913Swz6W8Y0 for ; Sat, 28 Mar 2026 08:56:37 +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 4fjWb866N9z4CjT for ; Sat, 28 Mar 2026 08:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774688196; 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=daKzLQZ7D57uaZylMd+YY0JzQF7tiFsyxPS4R0Fydq4=; b=VFo8KZjShngLO/lzwoI7dCjOEbgxp2roZ/7zy9UnYhXJXThQ0XuCvreuGKYQ34Rsfc+EYb EQJF7gh91Qo0/HWhZr1M8Ba/sAVNJYLzXxvvT8RTGd4z8LwpI04E7YsMSB54SYlb2poadH uqZJ5gpzlLXPcjc12L+h2be30pv49vB4eOTOUotqLyU/bi7WQbZZ9NoK3eDjR9h8RcmiOP L/TVx9RZ+pSQXGOr2juHCmFIzFmfMHWy1lM3WIBJxZjXUeeEI7uxwGljm6eoaMv15yvJbP NeluXRsK6rzd563gSatqW/dGrfu3HfZ9/eqsud4gHIcKe3dCVzGl5S5pzsiwSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774688196; a=rsa-sha256; cv=none; b=Jrf2aatGJFa18YmRbT0uEK2uq67wBFYU7vC5rk6aQ8e6odYapQT7nhoiqy6VHPDHegazzr Xpe7cOvIQs9mPmmnhuD+fsuMUnyV4lpmQSDab6mc724Q/wjKfrhIdL/2nSKDaY2DmpE+w8 RjAIJhNimQdrv3UW92x4Jp/IytiUU31AwO+yXYJEsbDFmy/pc2L81ux3rJnduPZFfbr5cU IICPQ+amAOpXGevGS4vvf8yx/XMu/K9pJcx3quZWpzdCuzl2zgCOGzLsEOH7N+qsTExX/r 3SgQL5LjDPzn/nNHeKn+LIUKlVWzsQxX416V1/MLoI7RC3M0A8/QJ2nhvTHOCA== 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=1774688196; 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=daKzLQZ7D57uaZylMd+YY0JzQF7tiFsyxPS4R0Fydq4=; b=B9koGXiO0hSvvYu4z2WPSnilHmXxEiW18BykcXdz7O+bprh1xy0m4S9X7s30Ew6eZIZcdJ +CnfTAQVxN+V2La9P/Vhwe55YUcmtqISZAlHgZiLJo9Yj4eM473y4qfrFMf1FfdQ/qAc4+ EtRybEjrDrPMJQFU0YW4XhhWHbT/IPjw5bU2gmBV1nTOhp7QrVn+KqONLhAFRamEDQQF85 DjbQv0bbj0LTZQsEbLiz+Nahjr+g1Akv/8duGwOp5WcXLFYfDEmb37Y434BTO7LkOcJY43 HSuCDari0FXE5DxwEOCqgn6QEyEphKpY3wEKDWg79V1QjbgAq0eSnAaBKBbTHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fjWb84bq3z3gj for ; Sat, 28 Mar 2026 08:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2382f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Mar 2026 08:56:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: c8d40bf8ecc6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: c8d40bf8ecc60cc15e3904410db62065ea681fdc Auto-Submitted: auto-generated Date: Sat, 28 Mar 2026 08:56:36 +0000 Message-Id: <69c797c4.2382f.2a65e50d@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d40bf8ecc60cc15e3904410db62065ea681fdc commit c8d40bf8ecc60cc15e3904410db62065ea681fdc Author: Baptiste Daroussin AuthorDate: 2026-03-28 08:55:24 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-28 08:55:24 +0000 diff: use O_CLOEXEC on pipes This only simplifies the code, no functional changes expected MFC After: 1 week --- 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 };