git: c4368d03e52c - main - improve handling of shell metacharacters in filenames

The branch main has been updated by wosch:

URL: https://cgit.FreeBSD.org/src/commit/?id=c4368d03e52c7c97d583ee6b81a59510d371ffbb

commit c4368d03e52c7c97d583ee6b81a59510d371ffbb
Author:     Wolfram Schneider <wosch@FreeBSD.org>
AuthorDate: 2023-12-27 17:35:08 +0000
Commit:     Wolfram Schneider <wosch@FreeBSD.org>
CommitDate: 2023-12-27 17:36:51 +0000

    improve handling of shell metacharacters in filenames
    
    PR:             275967
    MFC after:      1 week
---
 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 b18895a91d96..87594699b2c2 100755
--- a/usr.bin/man/man.sh
+++ b/usr.bin/man/man.sh
@@ -143,8 +143,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
@@ -169,8 +169,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
@@ -342,10 +342,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
@@ -370,7 +370,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
@@ -383,10 +383,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
 }
@@ -476,10 +476,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
 }