mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-29 13:15:05 +00:00
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
(cherry picked from commit b8a484ec34
)
This commit is contained in:
parent
ea3197e69b
commit
47cb760dac
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue