D44798.diff
No OneTemporary
Actions

Size

782 B

Referenced Files

None

Subscribers

None

D44798.diff
View Options

	diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
	--- a/usr.bin/man/man.sh
	+++ b/usr.bin/man/man.sh
	@@ -33,6 +33,12 @@
	# it is better to terminate it.
	ulimit -t 20

	+# do not ignore the exit status of roff tools
	+set -o pipefail
	+
	+# ignore SIGPIPE exits because pagers may exit before reading all their input.
	+trap '' SIGPIPE
	+
	# Usage: add_to_manpath path
	# Adds a variable to manpath while ensuring we don't have duplicates.
	# Returns true if we were able to add something. False otherwise.
	@@ -312,7 +318,7 @@
	# We need to loop to accommodate multiple .so directives.
	while true
	do
	- line=$($cattool "$manpage" \| head -n1)
	+ line=$($cattool "$manpage" 2>/dev/null \| head -n1)
	case "$line" in
	.so*) trim "${line#.so}"
	decho "$manpage includes $tstr"