From nobody Tue Feb 25 00:37:57 2025 X-Original-To: dev-commits-src-branches@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 4Z1zGZ0GGwz5p26D; Tue, 25 Feb 2025 00:37:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1zGY5SxKz3YpW; Tue, 25 Feb 2025 00:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740443877; 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=NMf3puub2H5cS9wiUlr9E2MKMFkoYhvBhNN6XVkWfmk=; b=Nm4G7Bz4FtjEQ6+V5TtyvJodurUGImOkSmn2c8EtXfQOZWihi2GaJFIEUyDf3vTz5nxLf3 AQlIOXLoGosE47CEYjRZGHc4AUvo4rZYSeriaLz4+vimMM1w9rjQX0m59iRkg7jch1feN8 VrE5oTA6N7gZ0+jCH2bhy+I7Ca/OhDHsmbZWdQyTaU/1g66/YjA/klm6EaSF8mVizzn1S6 Z0YYZZehZXt4ZTA023wkT1adZ0titChWBwNIyTw2xgZXo6ZiLSYXl2D7ZRDW4WNqbR1xvV cubu0fRKGujMD+kvXNRfayoinmwjSOiGvM+r9BdN16IXGPI6ix4xym1As4uP3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740443877; a=rsa-sha256; cv=none; b=QMW8NY1SJP0uQCzFtW0zjwDgX61mQ0HeoOOSld3T8XYQn+dp6e24Gt1nVRB8gNlbVSUWg/ ULaSMZw/4dRtSwQdFA2VP3Bgpw45vt5VVFW+QRWpcqx3CQQ4tWvjB/zE/PdagD8YrOVg36 UUeSRgnrQYOUheG67aBkB8sZgVLI4ruWOz8kI40/LHPqzcGDJEc00fQvMPnRKoMpARnwvp 6v2khOdlVrfSg582o6c8cNnkuZMgEIPtMc0sruNzZUppmkBQquhCDb/RPGR7m6yAz+PpVE 8bXJD3ONZfyz3mYVzD173eMN9+vppaymHV2r/5gpQpKu9CORCtmBC6Qr/pNhfw== 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=1740443877; 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=NMf3puub2H5cS9wiUlr9E2MKMFkoYhvBhNN6XVkWfmk=; b=AUYBCCeO/IYtn9FftfnYFom0wPsHu/Vsna8Xu0a0u/aDzyZed/JGN6jaxPII7gqIqdR2Wr IFyUHA+eVMZpQFln6trkRcvUdkARJkirJiWmdlEQCA7NGNIvxhY8IlyRFnOhcbX0EsRcra FAzWV6+5Mu4R0ZUHG+Tz45Hb8nzGH0OpRWVBzaWevUmQvJIadJZdsalI3OiWsu6iHddUXi n+4P4s5Wi6WSjL7L0LVrUQhMcHQXaw3tWu2ewUTxJDvjeIG8btVi2Fcb9qPr888WZLiuUr RrMp4L3h/u94L+DGYvyUCGWYG84QvZnGJxNWhsO9yAlYzsEw2S0axDc/xPETsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z1zGY52Cwz13J2; Tue, 25 Feb 2025 00:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51P0bvCu096659; Tue, 25 Feb 2025 00:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51P0bvXb096656; Tue, 25 Feb 2025 00:37:57 GMT (envelope-from git) Date: Tue, 25 Feb 2025 00:37:57 GMT Message-Id: <202502250037.51P0bvXb096656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: b006133ca117 - stable/14 - shar: Handle special characters or white space in file names fed to shar List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b006133ca1176a89abd3f96bb87989a85342f6a8 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b006133ca1176a89abd3f96bb87989a85342f6a8 commit b006133ca1176a89abd3f96bb87989a85342f6a8 Author: Cy Schubert AuthorDate: 2025-01-02 03:35:31 +0000 Commit: Cy Schubert CommitDate: 2025-02-25 00:37:46 +0000 shar: Handle special characters or white space in file names fed to shar Obtained from: NetBSD hg commit 365370:124268924386 MFC after: 1 week (cherry picked from commit 1080f5315427b382221651b342227b4923106f83) --- usr.bin/shar/shar.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh index 77ef3789c8b3..f7496716acba 100644 --- a/usr.bin/shar/shar.sh +++ b/usr.bin/shar/shar.sh @@ -64,14 +64,14 @@ echo "#" for i do - if [ -d $i ]; then - echo "echo c - $i" - echo "mkdir -p $i > /dev/null 2>&1" + if [ -d "$i" ]; then + echo "echo c - '$i'" + echo "mkdir -p '$i' > /dev/null 2>&1" else - md5sum=`echo -n $i | md5` - echo "echo x - $i" - echo "sed 's/^X//' >$i << '$md5sum'" - sed 's/^/X/' $i || exit + md5sum=`echo -n "$i" | md5` + echo "echo x - '$i'" + echo "sed 's/^X//' >'$i' << '$md5sum'" + sed 's/^/X/' "$i" || exit echo "$md5sum" fi done