diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-12-04 12:33:46 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-12-04 12:33:46 +0000 |
| commit | d9405a926cc5e004c81262c4503ab122084c73f0 (patch) | |
| tree | 42869c578217f4f50f434883b03b4c5328b32780 /usr.bin/man | |
| parent | 78f23de54c1f5c42ea24d3bb9dc477c3ea552a97 (diff) | |
| download | src-test-d9405a926cc5e004c81262c4503ab122084c73f0.tar.gz src-test-d9405a926cc5e004c81262c4503ab122084c73f0.zip | |
In case man(1) found a catpage to display skip looking ".so" which is manpage
only.
In case we are trying to read a catpage, the manpage variable is not defined.
It results in the "cattool" having no arguments.
In case the catpage is compressed, the cattool used is "zcat" which dies if the
standard input is a terminal, meaning the function calling it is exiting as if
there were no ".so"
In case the catpage is uncompressed, the cattool used is "zcat -f" which waits
reading standard input, making the man(1) command hang.
PR: 223560
Reported by: wosch
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=326526
Diffstat (limited to 'usr.bin/man')
| -rwxr-xr-x | usr.bin/man/man.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 78e6a7ab39298..3f9244b108697 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -276,6 +276,9 @@ man_check_for_so() { local IFS line tstr unset IFS + if [ -n "$catpage" ]; then + return 0 + fi # We need to loop to accommodate multiple .so directives. while true |