===================================================================
RCS file: /cvs/mandoc/demandoc.c,v
retrieving revision 1.23
retrieving revision 1.28
diff -u -p -r1.23 -r1.28
--- mandoc/demandoc.c	2015/10/20 02:01:31	1.23
+++ mandoc/demandoc.c	2017/01/10 13:47:00	1.28
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.23 2015/10/20 02:01:31 schwarze Exp $ */
+/*	$Id: demandoc.c,v 1.28 2017/01/10 13:47:00 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -20,7 +20,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -87,7 +86,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 +112,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 +122,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');
@@ -237,7 +239,7 @@ pmdoc(const struct roff_node *p, int *line, int *col, 
 {
 
 	for ( ; p; p = p->next) {
-		if (MDOC_LINE & p->flags)
+		if (NODE_LINE & p->flags)
 			pline(p->line, line, col, list);
 		if (ROFFT_TEXT == p->type)
 			pstring(p->string, p->pos, col, list);
@@ -251,7 +253,7 @@ pman(const struct roff_node *p, int *line, int *col, i
 {
 
 	for ( ; p; p = p->next) {
-		if (MAN_LINE & p->flags)
+		if (NODE_LINE & p->flags)
 			pline(p->line, line, col, list);
 		if (ROFFT_TEXT == p->type)
 			pstring(p->string, p->pos, col, list);