Author: bapt
Date: Fri Dec 8 10:44:44 2017
New Revision: 326686
URL: https://svnweb.freebsd.org/changeset/base/326686
Log:
MFC r326526:
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
Modified:
stable/10/usr.bin/man/man.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/man/man.sh
==============================================================================
--- stable/10/usr.bin/man/man.sh Fri Dec 8 10:42:05 2017
(r326685)
+++ stable/10/usr.bin/man/man.sh Fri Dec 8 10:44:44 2017
(r326686)
@@ -255,6 +255,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
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
