From nobody Thu Jan 25 07:20:14 2024 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 4TLBzz2pDHz57xqv; Thu, 25 Jan 2024 07:20:15 +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 4TLBzz14mwz40D3; Thu, 25 Jan 2024 07:20:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706167215; 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=5rIcaMVCA2K+TzXA88M/V0KuU9256GI6g/Q58fQJbBk=; b=uSquPOxyqeqVkKDoIkZDThT3ACj1yV7NTCAS6fIQA15UG8ogEUbUlno0WMdCBHH2eHXjaW 1tC7mduMstM+9mSSzkLmpSTBbtGEzwm0yHUfIHnYu8xExZVfgND38Wnfe470/9uAqn3Xe8 VbPR7/ASxz0DQ4TDCAlU7jCyzK6ohlPgGFFOFVsnzzFHcjp97+rPLMaR0O8y9Hqwpz9Xn7 wnSC414e5sQcgrS4yDllL5ORzl49RP4+Nx1GuFBPHBgqM4JrdGarNf3FIb+mRr+/6Ykx1U PKiEmgSgJ+h+TEVdlaGUdXsIuZrNkYYiacBKI9OkknwO5Om+8qAAPQLaN4bv3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706167215; 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=5rIcaMVCA2K+TzXA88M/V0KuU9256GI6g/Q58fQJbBk=; b=DxAmTzMSQ8MHBPGFjzaOE5N4f/NzhFJSny8D054/tKvcNjf9u/ImxKYzP4OY+czjCxdqtb 67R6Sjckixs4pSJz5keZeMM/Ci/CH8NmIzUOomPuXQ0WiyxAS+iUr8MCRPUUjg7+5qzkoE 6PRTiBvNpOoO8RiLvkoMhpVo66AGKMmpgHeFyy0HTL5c2vonTckI/2Exlr2fDtySzqiChR wBA06/rWBYyq1TRK1r80sU1/IqJUktd1TtC8XpihlHPoBP9rJlyp7Dobv9/L9iYAsOaBxQ F9goN8bRor9HQtE6gftjjF29vfi7gYccBIopMorc+m7zDGa28wGe8veaUiRkng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706167215; a=rsa-sha256; cv=none; b=Er9e4yvvoIHC19BzibVUhhRV7MN+jpud4aVngyulKr1APYakRZQCzhq4ujxXR9VN/Em4hz iccKEqJ1l6wglB1zgF34DSK6nFHPrqUnnBOoDOWrOToM/mA38k9E4i2Du2vLyHE559+sPQ eyiC8O4Yf/r/asCTNjtC8+fBZZHrz9zIOVVlkaBwh6aA6/vOFyrr4mrGCHEFNSWj+vuPxJ 24GkjpnLi8KHOPGmTjg3lOJrlDC0mJOUJ3EK/LcvbnFfem2lvSMup70IEBZuca9SC6NMHC qsxbZ4AEJd0mwruoqJ6jsJkLEUEEvGUVGAL6wdXWsmOklOfZ85iFucQ5S7YHxQ== 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 4TLBzz0B0Fzp7Z; Thu, 25 Jan 2024 07:20:15 +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 40P7KEYN076898; Thu, 25 Jan 2024 07:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P7KEhu076891; Thu, 25 Jan 2024 07:20:14 GMT (envelope-from git) Date: Thu, 25 Jan 2024 07:20:14 GMT Message-Id: <202401250720.40P7KEhu076891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: b8a484ec343d - main - man: support special characters in filenames 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: b8a484ec343d163a40f7cf4a6026e880f992c738 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=b8a484ec343d163a40f7cf4a6026e880f992c738 commit b8a484ec343d163a40f7cf4a6026e880f992c738 Author: Wolfram Schneider AuthorDate: 2024-01-25 07:14:06 +0000 Commit: Wolfram Schneider CommitDate: 2024-01-25 07:14:06 +0000 man: support special characters in filenames man.sh needs to handle double quotes and sub shell character as '`' '$' etc. PR: 275967 Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43453 --- usr.bin/man/man.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index efb05603f912..4be38083462c 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -349,7 +349,7 @@ man_display_page() { decho "Command: $cattool \"$catpage\" | $MANPAGER" ret=0 else - eval "$cattool \"$catpage\" | $MANPAGER" + $cattool "$catpage" | $MANPAGER ret=$? fi fi @@ -374,7 +374,7 @@ man_display_page() { pipeline="mandoc $mandoc_args | $MANPAGER" fi - if ! eval "$cattool \"$manpage\" | $testline" ;then + if ! $cattool "$manpage" | eval "$testline"; then if which -s groff; then man_display_page_groff else @@ -387,10 +387,10 @@ man_display_page() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool \"$manpage\" | $pipeline" + decho "Command: $cattool \"$manpage\" | eval \"$pipeline\"" ret=0 else - eval "$cattool \"$manpage\" | $pipeline" + $cattool "$manpage" | eval "$pipeline" ret=$? fi } @@ -480,10 +480,10 @@ man_display_page_groff() { fi if [ $debug -gt 0 ]; then - decho "Command: $cattool \"$manpage\" | $pipeline" + decho "Command: $cattool \"$manpage\" | eval \"$pipeline\"" ret=0 else - eval "$cattool \"$manpage\" | $pipeline" + $cattool "$manpage" | eval "$pipeline" ret=$? fi }