From nobody Wed Jun 10 13:45:00 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 4gb6Tm68J2z6gRT6 for ; Wed, 10 Jun 2026 13:45:00 +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 4gb6Tm2H1pz3M9w for ; Wed, 10 Jun 2026 13:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781099100; 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=gAcl7Pw7l5VYRaoLGnDXXtsqcGoZw0t34WxKPUcTyo0=; b=lPjvFGdqKwgQglvWam65rXe1E6HsbIVViVnb/eruw7xt2r1ZQpV7IsBDTcy/3Sza+UeW8j gOQkxHQMaq3f98fwQKjapYZ9G6G9VhsjMC2nf1gCdpykYN2IIOWgv5ehIDVRWx9xRqvEjg gF9Q5zw7JKoF79hsuUmloN8lz6j0ldfbrZ21rigxhfuDpiLCyX4h9cAwL5l9faV42Jst/G g9q9DG4iFxnSmm/Cxvmh4Uanni/Hj65kFFGR7Gv8NSuHvAwWJsoGif39eITMiv2lU4oyW2 dzD5E+tD2s7QMETO5xkFcWB/pPdL8n+nXVelAdqVE92KFMAVKoeIozdTlXqz5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781099100; a=rsa-sha256; cv=none; b=rb9nYP0Ymoqb4ShJLzJcYxfIZmnzcCdm3Ynycen1TSGW37jozYI1ESEmmfHz2k9L3alDI0 PFGXY2sF8JzIr/rUIMVVCCdVwjrzdLrvMuApg4L9IF/CEi9TiTXAYZaFuic8M84lQIxGy5 Y794NlUJNeAntYd8i/8UWHNMtmt66NMwafFLLBJhlrSn5/oRS/IlKSl7Rr+AgPjbiKO5e3 0Po9UnoEl54BdyJMFW1hj6geH6Vus32ABoqrg3exOrFCnMcS8oBpDeyshhtmHGaAv0EkKA Is474rDu3x1cNlUriekUK/aPOmiMxI3igpdBVtQ9hrVzZQ/y3u+nOgSVSfHyAg== 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=1781099100; 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=gAcl7Pw7l5VYRaoLGnDXXtsqcGoZw0t34WxKPUcTyo0=; b=NfJhzVTbTNBiK/50CET81XHT6SgSVrBN8pndqm4yaOwVSfgChdu6lnDFMwc6ygUWIp4Q6t 7LnBzHSFSk31QsJeLgK1pPlzTlDoGWS2pYzLMP8A5EnmqGOSBzp0qTEOGwgzt4ucoufsZd uZgyIVCoaTC1vpBQqlbxUXWAoFpRgOpKjXyVzet7Ad7iyrTURrt1XkcjhQW0hF0h8f/w19 zzq2SHAkwMwCMkG/xPcKOYb7787qnxTCH0+vd3LBvcXpD6jmxW83e5QIPqoNCBC6yKgc/B ei88q3AoS2oLCGQXbaRPigkzcclt3yjzEELUXhRglvAcou9Bm/J8YWnSEG/DnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gb6Tm1gBnz1LvF for ; Wed, 10 Jun 2026 13:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 13:45:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 4b570289f0cc - stable/15 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4b570289f0ccccdd35a47e62fec95835842c26fb Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 13:45:00 +0000 Message-Id: <6a296a5c.1d7a3.4659b1ff@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4b570289f0ccccdd35a47e62fec95835842c26fb commit 4b570289f0ccccdd35a47e62fec95835842c26fb Author: Ed Maste AuthorDate: 2026-06-03 01:27:54 +0000 Commit: Ed Maste CommitDate: 2026-06-10 13:43:59 +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 1aed8c1b24e4..c5acd536ef64 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -283,6 +283,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.