From nobody Tue Feb 25 00:38:17 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 4Z1zGx5c23z5p2Y7; Tue, 25 Feb 2025 00:38:17 +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 4Z1zGx2kH2z3ZLM; Tue, 25 Feb 2025 00:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740443897; 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=mmtopY/Nu1DT+ZM+8N82KSzB9+fYOom7yczaQ23dQys=; b=HdCho5juHBMRSgGq4nhIs7J+QLf+qcqVUsjc4R6ZLEsjrHMmhoQJHtylFBILA8DyXpJLoD xI+R9qQWwe968t0MvQP4l7wM6vM46TeexGaurTZs3LhjMnvDI/aaWAarGQT/E5VoBFCEJl ANElb20KUDvur3mhDsH5ZDW6YAAsQLDMu9DDyTIcclPp9o0pn7YPn3UipLZMjw/JxqcBJD Rbx6CufkscCk6jXB8LMvkFogBe19Tw3hImZHvD5rMdkKnp/HraSwKh4BVV6BbxESJt5uoO rZEMghLnMZSxv5i1PPphIC0mphC567l5hE+swlsMeOhPyLF1Qv2H6VaM2fQluA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740443897; a=rsa-sha256; cv=none; b=HXG2OPP68NhUgsJbDDGhWmXzwWlMnkj2kQdZ+oN9Qm3m2j5ZCb+HMqwisw8sNQOacp0Zry FEWhQs+pMyQkF9vXZz+YAGjdUx5iQCpHx34zHYsfbRci5Wxfy/NKLUm9JtKQHEuaN/RNjC 32DX6bRWVI5TvMvpOzmEeD2G3Ut8Ip68TQruC6Tb9Z/9rMvaByLTE6zNPVoimm7AHdR2pU gcc7BNI/CTNh+3NxTIXTRL/LsSZLbzCsvlYbAlsGdQ/JWOHZMDY7U4fAyg7bE8Ma24mdo8 BwL2d+7USxafJznQSuspakAwXVQgVdUBWx2kgmk8GHh9IxFYCBoH9VvxGrFc1w== 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=1740443897; 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=mmtopY/Nu1DT+ZM+8N82KSzB9+fYOom7yczaQ23dQys=; b=romaKPNaLPVuXqzA0+Mr00G5QtouNEm4ws1hHj/aKqWf6V2Clw3rwuTl3G6VUQ26388mov +qQuNvXqDEu22/Bw7cgLSrvlRdqqJnXlX0l1KzDHa6s1HsejOXay/1yzjyb5eRWVZsqSxP mnGe4GeODSMoBzDlozssETkPb9RxlaqoccuaiW2e13FTINjNGqsCxR9BK9sMGNgjqT5I2n 6c8Y4ZdI94/z936Q+4by95L6D7i5cjTrpT8K1HE1qXEdcCkyeXVGriiKQDVZ9fIZoTEgVl naBBRgZu0omErKByS4EYP434cTXnIoUV0do4ACg/5DKufOK0JGJCJGugzqrwTA== 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 4Z1zGx24ZGz131C; Tue, 25 Feb 2025 00:38:17 +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 51P0cHFs096964; Tue, 25 Feb 2025 00:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51P0cHqv096961; Tue, 25 Feb 2025 00:38:17 GMT (envelope-from git) Date: Tue, 25 Feb 2025 00:38:17 GMT Message-Id: <202502250038.51P0cHqv096961@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: 9b70262b0807 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 9b70262b08076ecde0262173e33d9cfc805b14b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9b70262b08076ecde0262173e33d9cfc805b14b5 commit 9b70262b08076ecde0262173e33d9cfc805b14b5 Author: Cy Schubert AuthorDate: 2025-01-02 03:35:31 +0000 Commit: Cy Schubert CommitDate: 2025-02-25 00:38:10 +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