From nobody Tue Jul 28 09:34:24 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 4h8VfT2nlCz6mSJ0 for ; Tue, 28 Jul 2026 09:34:25 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8VfT04KNz3Vww for ; Tue, 28 Jul 2026 09:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785231265; 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=Gw/xJhdh+MmhYgJqIRoYhrZm7/mfuIdx0EvOwj9eue8=; b=EA4yRoOsfF6t4BFt+VuEsDKCeCGAAzMwjFEj3elnih8aNCMMl7v/yipFBuP6zygARY6gGx T3maMl4VH6x0DYf/aMSUZUYUHgfxQIP+MCKinDtS/s+VKCND+kIt/mDSE6cUWOT/KhcpWp Zn741BqUPfsCxy2WCNFmeIJ0BilZT+eVGtKsN1vvKG+xk0pOh5yJUrx/Vkef6FiFk3T7zD X8o2szXMIMlOEu9HXQ7nFc8wAnSTn3HwtLcX0I0SzLNo65Q6yTiFL699/D/k5r9uCmg/Tk 5SdEEVhQcjpDySfU3zTJZ4AkpxCDzghsfpRpKN69iTg2FFpYd7Wo9vixhf22UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785231265; a=rsa-sha256; cv=none; b=qdEgFLLhHXw8EX0JRJ5cZCCYecZ1Bkk+WxrYdxnQAo/ZP160A31G7txumZVIZYVrYUQydO 1DNHKOhWDxFUzAKoypVqEb0rHdMaCkSXq47WwD4I2AOiUn0pHYxsJGN5kbDv2KSmrrfeQ0 foFm9czl0a6qQ4UWfbFFPJMIZjtVw/Tq/sZh1G7yJbHuMycmcSZoZ9oUjmp0WsgITXWQVA Y1vTfXSorT+Eo0HFW4KHJpPW1gY5gx/jR17ASbcZqvAJLRn41RenqxjwyrrfM96c9bztIr 2e37BW/bOXYMbYliKB10/Nq1zJOSLA1L2E1YET+O9bimkvrRYGxmppwXQgmTlw== 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=1785231265; 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=Gw/xJhdh+MmhYgJqIRoYhrZm7/mfuIdx0EvOwj9eue8=; b=fNBSrZIpXeVUyqmhSs4iwb8zk5b+9DG5bnLPBM+Zz/HraMQRjlAGNQuQkf6AhOlo3dVFjk BgSBcIB/XA2Dyb9F1U4wakPE0jpzanxw3010tbsNtiMpMBz9aJUiJIgwTGc7z677NWmI2O NUZ1Wpck7CYSvswtDF5ipGJ5AZDFkRdkKOKSC082ZE1QVCXpAEathtivs/1XZkMyQEWFR+ 8fTAsbuCsP8RtSbklWwkodeLqInMmFpWcUcEvBpjJ6U53dxjaseZuwGIx7d1krQxp4HCcR GdoObhze04vC9vFut6/62Kyy6SDkerD8+sdKCYJXrdzMEE1ezd7pGYeEtcNxpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8VfS5ykWzZdM for ; Tue, 28 Jul 2026 09:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 09:34:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 44eb447094b7 - stable/14 - xinstall: Do not allow -l and -s together 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: 44eb447094b7ddd181389f5fcb4fb0cae0fee957 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 09:34:24 +0000 Message-Id: <6a6877a0.1c0e5.7a6adab7@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=44eb447094b7ddd181389f5fcb4fb0cae0fee957 commit 44eb447094b7ddd181389f5fcb4fb0cae0fee957 Author: Ed Maste AuthorDate: 2026-06-03 01:27:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-28 09:31:41 +0000 xinstall: Do not allow -l and -s together Cannot strip the target if creating a link. Reviewed by: des Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57398 (cherry picked from commit 521afce6a859c1d7ac9674e8f21ff45418becaf5) --- usr.bin/xinstall/tests/install_test.sh | 3 +++ usr.bin/xinstall/xinstall.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index 6b091f26b377..377920200490 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -27,8 +27,11 @@ atf_test_case incompatible_opts incompatible_opts_body() { + printf 'test\n123\r456\r\n789\0z' >testf atf_check -s not-exit:0 -e match:"specified together" \ install -s -d dir1 + atf_check -s not-exit:0 -e match:"specified together" \ + install -s -l s testf copyf } atf_test_case copy_to_empty diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index a5173603d6ff..04801c590e06 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -294,6 +294,12 @@ main(int argc, char *argv[]) usage(); } + /* Cannot strip if creating a link. */ + if (dostrip && dolink) { + warnx("-l and -s may not be specified together"); + usage(); + } + /* * Default permissions based on whether we're a directory or not, since * an +X may mean that we need to set the execute bit.