From owner-svn-src-head@freebsd.org  Mon Dec  4 12:51:06 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 BD4C3DFBCEC;
 Mon,  4 Dec 2017 12:51:06 +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 88232672A2;
 Mon,  4 Dec 2017 12:51: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 vB4Cp586077117;
 Mon, 4 Dec 2017 12:51:05 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB4Cp5aQ077116;
 Mon, 4 Dec 2017 12:51:05 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201712041251.vB4Cp5aQ077116@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: Mon, 4 Dec 2017 12:51:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326527 - head/usr.bin/man
X-SVN-Group: head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/usr.bin/man
X-SVN-Commit-Revision: 326527
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Dec 2017 12:51:06 -0000

Author: bapt
Date: Mon Dec  4 12:51:05 2017
New Revision: 326527
URL: https://svnweb.freebsd.org/changeset/base/326527

Log:
  Only skip looking for manpages if both man directory and cat directory
  are not existing.
  
  This allows man(1) to read catpages when no man directories are available at all
  
  PR:		223559
  Reported by:	wosch
  MFC after:	3 days

Modified:
  head/usr.bin/man/man.sh

Modified: head/usr.bin/man/man.sh
==============================================================================
--- head/usr.bin/man/man.sh	Mon Dec  4 12:33:46 2017	(r326526)
+++ head/usr.bin/man/man.sh	Mon Dec  4 12:51:05 2017	(r326527)
@@ -201,7 +201,7 @@ find_file() {
 		catroot="$catroot/$3"
 	fi
 
-	if [ ! -d "$manroot" ]; then
+	if [ ! -d "$manroot" -a ! -d "$catroot" ]; then
 		return 1
 	fi
 	decho "  Searching directory $manroot" 2