===================================================================
RCS file: /cvs/mandoc/demandoc.c,v
retrieving revision 1.23
retrieving revision 1.26
diff -u -p -r1.23 -r1.26
--- mandoc/demandoc.c	2015/10/20 02:01:31	1.23
+++ mandoc/demandoc.c	2016/01/08 02:53:13	1.26
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.23 2015/10/20 02:01:31 schwarze Exp $ */
+/*	$Id: demandoc.c,v 1.26 2016/01/08 02:53:13 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
 
 	for (i = 0; i < argc; i++) {
 		mparse_reset(mp);
-		if (mparse_open(mp, &fd, argv[i]) != MANDOCLEVEL_OK) {
+		if ((fd = mparse_open(mp, argv[i])) == -1) {
 			perror(argv[i]);
 			continue;
 		}
@@ -113,6 +113,7 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int
 	int		 line, col;
 
 	mparse_readfd(mp, fd, fn);
+	close(fd);
 	mparse_result(mp, &man, NULL);
 	line = 1;
 	col = 0;
@@ -122,8 +123,10 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int
 	if (man->macroset == MACROSET_MDOC) {
 		mdoc_validate(man);
 		pmdoc(man->first->child, &line, &col, list);
-	} else
+	} else {
+		man_validate(man);
 		pman(man->first->child, &line, &col, list);
+	}
 
 	if ( ! list)
 		putchar('\n');