From nobody Thu Aug 27 23:28:16 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 4hWHkt2hJvz6pbxL for ; Thu, 27 Aug 2026 23:28:22 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hWHkt1dyKz3xrZ for ; Thu, 27 Aug 2026 23:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787873302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OfRe6sy9nc1cVR14PDDJwTf1mNnB9xjX0ihTryUXwaw=; b=WjQgd9YKdZlb4rv9EJekrKrYGFJqehRR0DohKfgykEjjjrBDXHUiL2cSrF5koHIWsjFehm PbquRGYP7ScbyeGdBVOdac8GFHmSlqtsgLh5b8MM7kaUcCk2OEEPVsorJ2SOrzT3zdeD0P G8ESAYgR6jaehrnWiqcMYkrUPDDFIPycHowuFDEdH+HHPzf7Tgj8iJuHDNfMgBJ+6scJJv bxSyomEsysuA/h8ht5iXUp78TcM3vLRzWNSbPWYndEVOfLv/BO/Dq4Wa+KB+JZU5t52k10 qj+yUNx6aSu6oEebSge/J7b80OEQQ8J66205NyXjkL8lhfGdTcNBQBYxC1nP1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787873302; a=rsa-sha256; cv=none; b=dnXFQjDf05s6Cl9CPEIGGWo5uC2330HJb6v1+enz9mFtm4HKNPbvbCqencOqfxSaY+mxUO OHMXMpEGwDNVswidWFMeCEOYO8cjC464vo92/xGT7UVLBOOE7ncsgKi084fQZVnReSfM46 yvipBGxeulbUdlp5poFnDVz7kUOsT3+CLnwsKDrfIB3zIbdc+eh4+c8lNsHtrfK9LpviHs 7nLu8gVK3GVTdRXgr/pBF8cYOdKI728Ra6G4Qw9FhUN/vxRswUTKhmiTV4IE4h4RiYf9Em Rd+t8xh/f22RLmHT0u/xO7sIv/ZwmGLvYvnlFTL5LJpf3JaqM+pHZzPI0PuUlA== 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=1787873302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OfRe6sy9nc1cVR14PDDJwTf1mNnB9xjX0ihTryUXwaw=; b=H46kvghSDm+wbW2hZbtzFPo7dowt2nTzJK97Gveet83VhJPin7NFPGYhjVQI9UnuEyVgIM YCe0gvdR9ttJ9ehPYgh0ksdB0AtVshVhmsVGgB6boEP13KVvcc6ElLiIgKYtoXn8sMl705 h/eENS0l9DPdxWueDV0RHDzuBZV19AV3Nhk1HE2jMiRoOCNX+3vHS5iT7D8XE3t7dg5sGd QUlgtV6sPNjjH7nTmY/fjQSRR768+cioiYqAvQC0lXXrzTseWIoLW55v7rfuTCa5Ynts2V A1Dcxd5qFkkTFzaOlMb++7uUorKl/5mVl0ttxOCZmMucYYu05j3YzZ2lIofIkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hWHks3BWczlVD for ; Thu, 27 Aug 2026 23:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bfa1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Aug 2026 23:28:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 5805e0ec8872 - releng/14.5 - install: Fix two bugs in stdin code 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 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 5805e0ec8872e2a01df6aa3afda41bbd733b941a Auto-Submitted: auto-generated Date: Thu, 27 Aug 2026 23:28:16 +0000 Message-Id: <6a90c810.1bfa1.6ad8a3d@gitrepo.freebsd.org> The branch releng/14.5 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5805e0ec8872e2a01df6aa3afda41bbd733b941a commit 5805e0ec8872e2a01df6aa3afda41bbd733b941a Author: Dag-Erling Smørgrav AuthorDate: 2026-08-26 17:34:18 +0000 Commit: Colin Percival CommitDate: 2026-08-27 23:27:54 +0000 install: Fix two bugs in stdin code * Fix case where the source is - and the target exists. * Only call chflags() (to remove flags that might prevent us from replacing an existing target) in the exists case; otherwise, to_sb.st_flags is uninitialized. * Rename the source file in the stdin test case. * Extend null and stdin test cases to cover the case where the target already exists. Approved by: re (cperciva) PR: 297681 MFC after: 1 week Fixes: d34870708db9 ("install: Allow installing stdin") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D59144 (cherry picked from commit a5ff4125cf08a83f7e67f498e423f3e354144327) (cherry picked from commit 203438d0a38c50b366f6d2615e1076a53f4ffff8) --- usr.bin/xinstall/tests/install_test.sh | 24 +++++++++++++++++------- usr.bin/xinstall/xinstall.c | 6 +++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index 7acd02abbb80..1ea3dad7e31c 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -567,6 +567,11 @@ null_body() { atf_check install /dev/null dst/file atf_check test -f dst/file atf_check test ! -s dst/file + # what if target already exists? + echo "The Magic Words are Squeamish Ossifrage" >dst/file + atf_check test -s dst/file + atf_check install /dev/null dst/file + atf_check test ! -s dst/file } atf_test_case stdin @@ -575,16 +580,21 @@ stdin_head() { } stdin_body() { atf_check mkdir dst - echo "The Magic Words are Squeamish Ossifrage" >file - atf_check -s exit:71 -e not-empty install - dst src + atf_check -s exit:71 -e not-empty install - dst