system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-23 03:06:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve handling of shell metacharacters in filenames

Browse source 
PR:		275967
MFC after:	1 week
This commit is contained in:
Wolfram Schneider 2023-12-27 17:35:08 +00:00
parent 4a0c6403b0
commit c4368d03e5
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
usr.bin/man/man.sh
View file

@ -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
}