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 63a4ad7fed3a97a73f11ae1a0569e9addd46bd6f..c33fd89169a70bdd85e2ce866523f9b20a0f3563 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.23 2015/10/20 02:01:31 schwarze Exp $ */
+/*     $Id: demandoc.c,v 1.27 2016/07/09 15:24:19 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -20,7 +20,6 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <getopt.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.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);
 
        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;
                }
                        perror(argv[i]);
                        continue;
                }


@@ -113,6 +112,7 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list)
        int              line, col;
 
        mparse_readfd(mp, fd, fn);
        int              line, col;
 
        mparse_readfd(mp, fd, fn);

+       close(fd);

        mparse_result(mp, &man, NULL);
        line = 1;
        col = 0;
        mparse_result(mp, &man, NULL);
        line = 1;
        col = 0;


@@ -122,8 +122,10 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list)
        if (man->macroset == MACROSET_MDOC) {
                mdoc_validate(man);
                pmdoc(man->first->child, &line, &col, list);
        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);
                pman(man->first->child, &line, &col, list);

+       }

 
        if ( ! list)
                putchar('\n');
 
        if ( ! list)
                putchar('\n');