===================================================================
RCS file: /cvs/mandoc/mandocd.c,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- mandoc/mandocd.c	2018/12/13 11:55:46	1.7
+++ mandoc/mandocd.c	2019/03/03 11:01:15	1.10
@@ -1,4 +1,4 @@
-/*	$Id: mandocd.c,v 1.7 2018/12/13 11:55:46 schwarze Exp $ */
+/*	$Id: mandocd.c,v 1.10 2019/03/03 11:01:15 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -171,8 +171,8 @@ main(int argc, char *argv[])
 		errx(1, "file descriptor %s %s", argv[1], errstr);
 
 	mchars_alloc();
-	parser = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1,
-	    MANDOCERR_MAX, NULL, MANDOC_OS_OTHER, defos);
+	parser = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 |
+	    MPARSE_VALIDATE, MANDOC_OS_OTHER, defos);
 
 	memset(&options, 0, sizeof(options));
 	switch (outtype) {
@@ -244,35 +244,29 @@ main(int argc, char *argv[])
 static void
 process(struct mparse *parser, enum outt outtype, void *formatter)
 {
-	struct roff_man	 *man;
+	struct roff_meta *meta;
 
 	mparse_readfd(parser, STDIN_FILENO, "<unixfd>");
-	mparse_result(parser, &man, NULL);
-
-	if (man == NULL)
-		return;
-
-	if (man->macroset == MACROSET_MDOC) {
-		mdoc_validate(man);
+	meta = mparse_result(parser);
+	if (meta->macroset == MACROSET_MDOC) {
 		switch (outtype) {
 		case OUTT_ASCII:
 		case OUTT_UTF8:
-			terminal_mdoc(formatter, man);
+			terminal_mdoc(formatter, meta);
 			break;
 		case OUTT_HTML:
-			html_mdoc(formatter, man);
+			html_mdoc(formatter, meta);
 			break;
 		}
 	}
-	if (man->macroset == MACROSET_MAN) {
-		man_validate(man);
+	if (meta->macroset == MACROSET_MAN) {
 		switch (outtype) {
 		case OUTT_ASCII:
 		case OUTT_UTF8:
-			terminal_man(formatter, man);
+			terminal_man(formatter, meta);
 			break;
 		case OUTT_HTML:
-			html_man(formatter, man);
+			html_man(formatter, meta);
 			break;
 		}
 	}