From owner-svn-src-stable-11@freebsd.org  Fri Dec  8 10:42:07 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07B60EA0C4E;
 Fri,  8 Dec 2017 10:42:07 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C54026D134;
 Fri,  8 Dec 2017 10:42:06 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB8Ag5Du063746;
 Fri, 8 Dec 2017 10:42:05 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB8Ag5sc063745;
 Fri, 8 Dec 2017 10:42:05 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201712081042.vB8Ag5sc063745@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 8 Dec 2017 10:42:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326685 - stable/11/usr.bin/man
X-SVN-Group: stable-11
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: stable/11/usr.bin/man
X-SVN-Commit-Revision: 326685
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Dec 2017 10:42:07 -0000

Author: bapt
Date: Fri Dec  8 10:42:05 2017
New Revision: 326685
URL: https://svnweb.freebsd.org/changeset/base/326685

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/11/usr.bin/man/man.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/man/man.sh
==============================================================================
--- stable/11/usr.bin/man/man.sh	Fri Dec  8 10:31:02 2017	(r326684)
+++ stable/11/usr.bin/man/man.sh	Fri Dec  8 10:42:05 2017	(r326685)
@@ -274,6 +274,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