From nobody Wed Aug 26 17:34:26 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 4hVWwz1G0Dz6qPD4 for ; Wed, 26 Aug 2026 17:34: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hVWwy6Zsbz3xKL for ; Wed, 26 Aug 2026 17:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787765666; 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=+xMJoObWwNj5h20JmHpMst2uOz1LRvD/edWpWk6LDRY=; b=nwHSDWURgj4g0oW5Y+UIjj5riY49xcmCW4pNnl0zl2nUbPCTlR+Y1u/Jp7pJ/1TJDKpfPO AuEq4htLS1r1+7aGlGkGow5iLbV/dgDZSZA7fLjYwdXm/Ru+Qi7rGt3POESeaHx/cjw9Qz K6DRx6GxIurYv1NOxo7Kcecmy2EeLWZ7Zv9hDFgjtWKLztYjbW/Wt3Kg3kzk3ceaWjYz0P rmjvH7+aRJVoqfv0l1DAH1hysR/XfhOIUTfm1sykWiqyJLbbBd+0/9Lmq9A5vLxVaX63dJ FWf5nWrESxyKbKdTnPuRKXC7ZU/6YUJ7K4jbwhJmlX+vMLS05PgUhV9d0udyoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787765666; a=rsa-sha256; cv=none; b=IokYM13F/gEFkWz6tAF6Cp558MPnYAfd1+E2wDa1n9gLhwX5ormsXYjpCKwrXnf/3gyI5Y nOGaPunoRWILmM5UEsXisJczXplQ+qhzsa/X3C1tZVaU4pY8RODJ+enYML+F05Bgp20nT+ LwZHUGKQ+/hEiy+IbarWptODLK5NmCAJLqXeFPnqDUcjZzEBKKjcAXXHpN9Pjj4gYuj4in 14yYu81UsNDsOOoJMBl+yY5ZfzzmyluM3hyjoPu5OgPn0teQ/sgwA6TjlUBTwffQJEOyW/ KrskYJdZlrPJmCmVx+hKnCZnNz9H+nFcrpdocAKCwnHSZcEFttYF+3LISKGGLg== 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=1787765666; 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=+xMJoObWwNj5h20JmHpMst2uOz1LRvD/edWpWk6LDRY=; b=kFEIWIqhv2smBlQ0/OWadkSp2BeXqi3+R3LReOgCAuh0dG4PvtMTZxymw89QBoxi2dWEq4 s3oKp6jDAwW867Sqs01Y8kbqgRtTzXUCfGYu8JRd/uMsTUygWO2PtlMU3cHKqAp5cSC292 7BAYZ++NkUZ+j4kRaAIJMTkGPIU0ysJPNMi9jRA1gL2jqPtQlVCmEMTJkc+F+KbTn+jw2D CllCkqc4vDriKr50mJ++utPxCCm74en+uw0pogyVlMRIk+Ix+NXBsKen1zaoEhPbnZb4/D 5pg950C2Zg9fdaPIw/YidWqK7TWsgbBm2ZgedL8EImhRy4G9QEs721vlYBTXIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVWwy4zYGzp1f for ; Wed, 26 Aug 2026 17:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd62 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 17:34:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a5ff4125cf08 - main - install: Fix two bugs in stdin code 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5ff4125cf08a83f7e67f498e423f3e354144327 Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 17:34:26 +0000 Message-Id: <6a8f23a2.3fd62.7421b7eb@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a5ff4125cf08a83f7e67f498e423f3e354144327 commit a5ff4125cf08a83f7e67f498e423f3e354144327 Author: Dag-Erling Smørgrav AuthorDate: 2026-08-26 17:34:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-08-26 17:34:18 +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 --- 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