From nobody Thu Aug 27 06:34:45 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 4hVsFL3h90z6qYky for ; Thu, 27 Aug 2026 06:34:46 +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 4hVsFK5Ppyz3s7G for ; Thu, 27 Aug 2026 06:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787812485; 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=UnsYnXBwFXw+E5J6Xrc3cMfyMO+ZMBA1ZNdm/rf/WD0=; b=kC/2u28qAuPHLBcIg5pZnKLDaWcmn1q4oL6bYJXrSli/EebCizAfHZaTXNA28FMkgfXpc2 9aD6w7st/If4gKJehA1D9wk1eKUzxsXfQQrsIXxTpV9kBzLzpXpr5tJnjYJAw7l7gPCUPh aQLIpd5fo8Stif35kuPGg75iD4Jatt2mj8gXqavI/rgIu0O2XY05hZ3iRMqkANXQvPuTHA 2IpRae4q8biqoJDLJhYGcHkkbQzgFWRK3recIMnuaDfjXH6Zg0ctZs76+Wa9kFozuRBB63 Wv9753Yfpyq01HaOw0iRffwUjZSI3trrklPgbpY80Tei6yODM187I+PM+QncxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787812485; a=rsa-sha256; cv=none; b=u2C0Vg5HGUoo7Elyjteos2vrPXMbwPopIIq9xXP57tKtvkPlbzZ3AUN4ERQ54i4wlBiRNC bVuVmRCIHEtC0RsmnsAemDzPDvJQhW8vQWvNy2dryVW3INFrLnP5BmsM4XijKnKoI4Pgmq /tbyzF/m3VEYS5OQG0X0d2F1XJia7BbstZhvX8mC949pserUVCGy5p8kD0gunoFjzjTpUi ZlcwF2frApm0HYcXRWFhGjRgogaT3nDFuD2NGTobUzZz8jIMNZ1PBXWny8AAKD0weO/CuM T5qH6JTec8vJT7PCsuxTFJSJZtOuVu0jU/aOxn+AnL5LeTjHCRDJLIXHXtRDJw== 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=1787812485; 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=UnsYnXBwFXw+E5J6Xrc3cMfyMO+ZMBA1ZNdm/rf/WD0=; b=aY4EMCPBiWdCk+zdBcPxC8DO4jspkWOFpPJ2mak5uvXkAzH0h/JwlvWRqi83iy1AgSJzNm 0+zPV3i7Z1EoqtKfHiMCCrcQUFDxHmOWUJdZirzGSw+wq/ObaqZk29EAFBfdNfBXy8Tgb5 AjxufPS48Vu/cvdLyfbNr5beQ/9HC1TMEXu9fKGj+Xgv1Gd82bpGFyZhcyDK3nCvlUA77Z ncAY8y+VSIOIBegII5lZTJkfTYTYpyvTeEsGTyUCvUtlbUeyII+DOZ08CTouRpxfN0s0Q7 l0n6USc9URDg0T3Va/eqxtB5aq1q/cR/kJau6edpPDqW0RgYheQsRjkcC994Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVsFK3H55z1B5P for ; Thu, 27 Aug 2026 06:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a11a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Aug 2026 06:34:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 203438d0a38c - stable/14 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 203438d0a38c50b366f6d2615e1076a53f4ffff8 Auto-Submitted: auto-generated Date: Thu, 27 Aug 2026 06:34:45 +0000 Message-Id: <6a8fda85.1a11a.29f509af@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=203438d0a38c50b366f6d2615e1076a53f4ffff8 commit 203438d0a38c50b366f6d2615e1076a53f4ffff8 Author: Dag-Erling Smørgrav AuthorDate: 2026-08-26 17:34:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-08-27 06:34:19 +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. 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) --- 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