external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

fun/man: fix for old Solaris man(1) command

Browse source 
The Solaris 10.1 man command happily exits with status 0 on error
and even prints error messages to standard output. This was fixed
in later versions of Solaris. but we should still fix the function
for portability as it should work almost anywhere.

.man.try_os_man() now checks that the standard output of a man
command includes at least three newlines; that's probably a
reliable-enough indicator that it's a man page and not an error
message. Thankfully, all man commands do seem to deactivate the
pager when standard output is not on a terminal (e.g. when catching
standard output with a command substitution).
This commit is contained in:
Martijn Dekker 2022-07-25 02:14:35 +02:00
parent b8ea3ab76a
commit 08e5675345
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/cmd/ksh93/fun/man
View file

@ -56,10 +56,9 @@ namespace man
builtin_has_selfdoc()
{
typeset LF=$'\n' # linefeed/newline shorthand
[[ $(whence -t -- "$1") == builtin ]] \
&& [[ ! $1 =~ ^(:|true|false|echo)$ \
&& $LF$(builtin)$LF == *"$LF$(whence -- "$1")$LF"* ]]
&& $'\n'$(builtin)$'\n' == *$'\n'"$(whence -- "$1")"$'\n'* ]]
}
# Check if a binary or script has --man self-documentation by grepping
@ -104,17 +103,15 @@ namespace man
${PAGER:-less -R} # ...so we can safely split $PAGER
}
# Function to try if a system manual page in a section exists. If it
# does, it is shown as normal, otherwise the function returns false.
# On some systems 2>/dev/null will make man(1) misbehave if the page
# is found, so erase the error message after the fact.
# Try if a system manual page in a section exists. Unfortunately, we
# cannot portably rely on the exit status of the 'man' command to check
# for success, so test if its standard output includes at least three
# newline control characters. (Thankfully, all OS man commands seem to
# deactivate the pager if standard output is not on a terminal.)
try_os_man()
{
if ! command man -s "$1" "$2"; then
print -n $'\r\E[A\E[K' # erase man's error msg
false
fi
[[ $(command man -s "$1" "$2" 2>/dev/null) == *$'\n'*$'\n'*$'\n'* ]]
}
# The main function puts it all together. When given a single argument,
@ -131,8 +128,10 @@ namespace man
command man "$@"
elif builtin_has_selfdoc "$1"; then
show_selfdoc "$1" | pager
elif try_os_man 1 "$1" || try_os_man 8 "$1"; then
:
elif try_os_man 1 "$1"; then
command man -s 1 "$1"
elif try_os_man 8 "$1"; then
command man -s 8 "$1"
elif extcmd_has_selfdoc "$1"; then
show_selfdoc "$1" | pager
else