From nobody Wed Jun 3 20:50:44 2026 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 4gW0GD54pGz6ghhT for ; Wed, 03 Jun 2026 20:50:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gW0GD4Qz0z3Nlp for ; Wed, 03 Jun 2026 20:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780519844; 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=Q2lE3fHUz3zTgvBSPJZ3ffncw7USRcSgM601ZJF+B0I=; b=qk1gwMuHomF7MaOZ0OO+gj0PtTcKhei4yPi66Jw0OCGqjoYcb7bRgfwwDKrHCmvz0Zlajz xouHFRHr8cff93+2sr5H9Tdx9Y783i929SglOavFSzXYxA4oLXaamTIHKsZV9+QuE2vaGv JLYwSRsHsLNL2w3CakWRk0LdAVW5whHHNy+ouLy99d7GDPjlrEQDRYje/wRztZiBoVxSoJ 83JnNMHzx052YAZoTbo86FHgE4Kly17ndoEksI9xVisf4gcULPU2PIfdGIPOWUc4hbxRNG OnA3w7FU0Pas2U5jZgFRG3QCsm/N8m2kTdXFJ3+Vwdn2gIHeMrjIcA4aqQKi9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780519844; a=rsa-sha256; cv=none; b=gZ1Reex0NKPNctZUWzZvqw6NniDyFH36Sc0sWY6aSk47NT9BIPkJnL1q+EuXGVfIVWARCH WuskTr16MsvQHUtRMFJvHqpvF7XwcavpZjK2p8HeVpDFaEAe70q/lCOiXC4JMAZBKJVAox 3C7c2gYrCxWilMmzUPAd3dWnTA7nLqUPl8waFKH4Yu66cyR7oCxEu27DRYbkmTMAqLoFNH sqQ4atJL7LB55IJSNEHPn3l7dDVx1dLqgsY8GrOqgDlqoZJIzYWE8anZZS+UGoma0XSCtu yuBfQpFL0GjD0/PYt1ymXZW32/IiK2eIjTWufjlzP/0cHDEitHhYtiNuP+w+bg== 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=1780519844; 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=Q2lE3fHUz3zTgvBSPJZ3ffncw7USRcSgM601ZJF+B0I=; b=mJmlHH5rnwOh+NChNdcniKDuR4/htkPxqt4aOHBxCubssWzhVaNmU+pnornXan/pnicnDJ gmiQ4bZNW1KU5hAbX3JwTP3eTtSktjTMEzSS8+XSBkjS7ZuekuEZ9vQqye3Z6dz0Du5zCL BS6fN1ov5ovR4WnhiR6YZGmg/XHIwz2CsKs5JYu+wV12Mq22ZY7vC2Z96OenFt1DVULMRd GPhZqyAdW16Lsu7uKIg6xtzbI0s5V+OikoCyjtoC5+Ae7zkTU2GE1KSvGlVc8dKmB9dMPS +zOS2AIIa9JdKkQTuYYez3bsdqZ88GiLwmw0h+EUbGdEtFWXtc7xVhSJBwv+ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gW0GD3xsTzBlX for ; Wed, 03 Jun 2026 20:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b045 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Jun 2026 20:50:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jilles Tjoelker Subject: git: 8bf490256986 - main - diff: Correct fd 0 case on pipe 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jilles X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bf4902569869133affd91bdcb71b74656cfc36e Auto-Submitted: auto-generated Date: Wed, 03 Jun 2026 20:50:44 +0000 Message-Id: <6a2093a4.3b045.4175e932@gitrepo.freebsd.org> The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=8bf4902569869133affd91bdcb71b74656cfc36e commit 8bf4902569869133affd91bdcb71b74656cfc36e Author: Jilles Tjoelker AuthorDate: 2026-06-03 20:42:01 +0000 Commit: Jilles Tjoelker CommitDate: 2026-06-03 20:50:38 +0000 diff: Correct fd 0 case on pipe After git commit c8d40bf8ecc60cc15e3904410db62065ea681fdc, if fd 0 was not open, it is left with CLOEXEC set and therefore fails. This is an unlikely situation, but fixing it reduces the size of the code (by using posix_spawn_file_actions_adddup2's special case if the two file descriptor numbers are the same). At the same time, check the error code from posix_spawn_file_actions_adddup2. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D56910 --- usr.bin/diff/pr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index e8a4162d8b18..57cbb6a56ce5 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -71,8 +71,9 @@ start_pr(char *file1, char *file2) posix_spawnattr_setprocdescp_np(&sa, &pr->procd, 0); - if (pfd[0] != STDIN_FILENO) - posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO); + error = posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO); + if (error != 0) + errc(2, error, "posix_spawn_file_actions_adddup2"); char *argv[] = { __DECONST(char *, _PATH_PR), __DECONST(char *, "-h"), header, NULL };