From nobody Fri Jan 05 08:20:04 2024 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 4T5xGD5jtGz56TrV; Fri, 5 Jan 2024 08:20:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T5xGD5CxKz453F; Fri, 5 Jan 2024 08:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704442804; 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=tZaqouuMUIHIuuyv/snZ1zrOsN9OAi3hJ4ko4/gvXrA=; b=fLkfjeWZPpjn1p3j3Xm8g5CNHzkBGFrQaBUUqYvWHhnaxqZkFmdSM0Eayx7ACHl6oLMKko 0ntJbdsAHdCi4AyXMW/FVApJyBi7ICjvnOqzBMjcuqZRB4yxuqfGF4peRobV3LZ01cfx8p m8i0Uml197EoHu1sXO6xukVvjmGv5o2/u9UPrymhKIVil0mENkYETrFnG5W8fY0hMO6Wq0 iZWCyRrNcpVgSi1ABbSLKZ7lgGunWyd2vmMQ5BzA+a6UGtMg09XYJ5+sanHNjNUWQ/SWBZ Uyod67u1KoqmXGEdbV1dl3uCVb6KIqBtoEddcq8752JzQDVERoBwfbY0yTRhag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704442804; 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=tZaqouuMUIHIuuyv/snZ1zrOsN9OAi3hJ4ko4/gvXrA=; b=wT6ipoKfcmaUGr8dPxHDUZGqiAS6/17bchBG1OOm++YORJbtcPgcXow6J/iLnP+q7EVAas QcTSj6x6IsRqLfMfaKo//EFj4KNss1NuwnF8AoS2zpxc0/Epcz6PJSi8tOcrlOt8fS8/C5 DnkUPBHtq842YhN4XbJVXN4tWKBtnJhQ37Z0VrrS9h9Xr/aH1wPL0YbLrEao63cL+/DsXz w0cKW7sAZrKgFzi3DxY+9FJv5C9nCm9eJyX4Hd/iabEG06pzLI1A20+GsCQm/8alVu+zUx fQQYIuw6cEyQaCjmj8o4TRrGE11XFgDEdgn0IJAgbUACfEtSPKf3qSLFctOk8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704442804; a=rsa-sha256; cv=none; b=UjbPiI+GNR1mZnOBr6O5W3XSkyK4IVbwijOeyMVSy8UcVUtArOEXDOK+cXEjBUvGX1gqp4 gbVpedITfQwsdDzvgFQD6o93qVRn0vAXjQVRKZGMBOOClKVoUR0+Rp24E3N8gLDRxMIaKU JoPa9dz75wFcDyy247F+X5TN407Wg5Kn/EGptRmozXtLti+KPfLfl/A1t9a3AWkC46GB8E 19+oq5TxE9slcagaW+C3Z1hIZsdqALkUG1JoGxsPaKvtndR0+3g+MKzLaU6lSssFJQ+KAO 2pZlho3BVsmNjGHAx4eTDBYrsfI7JbHQ6vC4OdgZX4UNjbqEA1Utv3PbamfnUg== 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 4T5xGD4HNqzqhD; Fri, 5 Jan 2024 08:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4058K4Qv018844; Fri, 5 Jan 2024 08:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4058K4Ii018840; Fri, 5 Jan 2024 08:20:04 GMT (envelope-from git) Date: Fri, 5 Jan 2024 08:20:04 GMT Message-Id: <202401050820.4058K4Ii018840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wolfram Schneider Subject: git: 05daf917987e - stable/13 - improve handling of shell metacharacters in filenames 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05daf917987e2e5e29fa0f8a4bfb519f6d2ec953 Auto-Submitted: auto-generated The branch stable/13 has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=05daf917987e2e5e29fa0f8a4bfb519f6d2ec953 commit 05daf917987e2e5e29fa0f8a4bfb519f6d2ec953 Author: Wolfram Schneider AuthorDate: 2023-12-27 17:35:08 +0000 Commit: Wolfram Schneider CommitDate: 2024-01-05 08:19:10 +0000 improve handling of shell metacharacters in filenames PR: 275967 MFC after: 1 week (cherry picked from commit c4368d03e52c7c97d583ee6b81a59510d371ffbb) --- usr.bin/man/man.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 96040c533de5..ed5724d64678 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -118,8 +118,8 @@ check_cat() { if exists "$1"; then use_cat=yes catpage=$found - setup_cattool $catpage - decho " Found catpage $catpage" + setup_cattool "$catpage" + decho " Found catpage \"$catpage\"" return 0 else return 1 @@ -144,8 +144,8 @@ check_man() { # cat page found and is newer, use that use_cat=yes catpage=$found - setup_cattool $catpage - decho " Using catpage $catpage" + setup_cattool "$catpage" + decho " Using catpage \"$catpage\"" else # no cat page or is older unset use_cat @@ -317,10 +317,10 @@ man_display_page() { ret=0 else if [ $debug -gt 0 ]; then - decho "Command: $cattool $catpage | $MANPAGER" + decho "Command: $cattool \"$catpage\" | $MANPAGER" ret=0 else - eval "$cattool $catpage | $MANPAGER" + eval "$cattool \"$catpage\" | $MANPAGER" ret=$? fi fi @@ -345,7 +345,7 @@ man_display_page() { pipeline="mandoc $mandoc_args | $MANPAGER" fi - if ! eval "$cattool $manpage | $testline" ;then + if ! eval "$cattool \"$manpage\" | $testline" ;then if which -s groff; then man_display_page_groff else @@ -358,10 +358,10 @@ man_display_page() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool $manpage | $pipeline" + decho "Command: $cattool \"$manpage\" | $pipeline" ret=0 else - eval "$cattool $manpage | $pipeline" + eval "$cattool \"$manpage\" | $pipeline" ret=$? fi } @@ -451,10 +451,10 @@ man_display_page_groff() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool $manpage | $pipeline" + decho "Command: $cattool \"$manpage\" | $pipeline" ret=0 else - eval "$cattool $manpage | $pipeline" + eval "$cattool \"$manpage\" | $pipeline" ret=$? fi }