From owner-svn-src-vendor@freebsd.org  Mon Jan 18 08:41:05 2016
Return-Path: <owner-svn-src-vendor@freebsd.org>
Delivered-To: svn-src-vendor@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 214BFA866B8;
 Mon, 18 Jan 2016 08:41:05 +0000 (UTC)
 (envelope-from delphij@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 E0EBC132F;
 Mon, 18 Jan 2016 08:41:04 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0I8f3W5079598;
 Mon, 18 Jan 2016 08:41:03 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0I8f3Mi079597;
 Mon, 18 Jan 2016 08:41:03 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201601180841.u0I8f3Mi079597@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 18 Jan 2016 08:41:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r294260 - vendor/mdocml/dist
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-vendor>, 
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2016 08:41:05 -0000

Author: delphij
Date: Mon Jan 18 08:41:03 2016
New Revision: 294260
URL: https://svnweb.freebsd.org/changeset/base/294260

Log:
  Fix a wrong assertion in mandoc by applying OpenBSD
  main.c,v 1.170 (florian):
  
  Unbreak reading from stdin after recent parse() restructuring.
  OK schwarze@

Modified:
  vendor/mdocml/dist/main.c

Modified: vendor/mdocml/dist/main.c
==============================================================================
--- vendor/mdocml/dist/main.c	Mon Jan 18 06:59:00 2016	(r294259)
+++ vendor/mdocml/dist/main.c	Mon Jan 18 08:41:03 2016	(r294260)
@@ -720,7 +720,7 @@ parse(struct curparse *curp, int fd, con
 	/* Begin by parsing the file itself. */
 
 	assert(file);
-	assert(fd > 0);
+	assert(fd >= 0);
 
 	rctmp = mparse_readfd(curp->mp, fd, file);
 	if (fd != STDIN_FILENO)