No need to populate the TYPE_arch and TYPE_sec bits, the information

[mandoc.git] / demandoc.c

diff --git a/demandoc.c b/demandoc.c
index 77b42f35107f626fe819003e46f3667d5ce9f023..c33fd89169a70bdd85e2ce866523f9b20a0f3563 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.21 2015/10/06 18:32:19 schwarze Exp $ */
+/*     $Id: demandoc.c,v 1.27 2016/07/09 15:24:19 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>
@@ -44,7 +43,6 @@ int
 main(int argc, char *argv[])
 {
        struct mparse   *mp;
-       struct mchars   *mchars;
        int              ch, fd, i, list;
        extern int       optind;
 
@@ -79,8 +77,8 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
-       mchars = mchars_alloc();
-       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, mchars, NULL);
+       mchars_alloc();
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, NULL);
        assert(mp);
 
        if (argc < 1)
@@ -88,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;
                }
@@ -96,7 +94,7 @@ main(int argc, char *argv[])
        }
 
        mparse_free(mp);
-       mchars_free(mchars);
+       mchars_free();
        return (int)MANDOCLEVEL_OK;
 }
 
@@ -114,16 +112,20 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list)
        int              line, col;
 
        mparse_readfd(mp, fd, fn);
+       close(fd);
        mparse_result(mp, &man, NULL);
        line = 1;
        col = 0;
 
        if (man == NULL)
                return;
-       if (man->macroset == MACROSET_MDOC)
+       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');