improve homebrew cellar config example

[mandoc.git] / demandoc.c

diff --git a/demandoc.c b/demandoc.c
index aad42085b185b7ab274f4c88dd9fd46846674c3a..37043e3003c95e259140bb3817c4d13660f36438 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.7 2012/05/31 22:27:14 schwarze Exp $ */
+/*     $Id: demandoc.c,v 1.13 2015/01/15 04:26:39 schwarze Exp $ */

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


@@ -14,9 +14,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -43,7 +43,8 @@ int
 main(int argc, char *argv[])
 {
        struct mparse   *mp;
 main(int argc, char *argv[])
 {
        struct mparse   *mp;

-       int              ch, i, list;
+       struct mchars   *mchars;
+       int              ch, fd, i, list;

        extern int       optind;
 
        progname = strrchr(argv[0], '/');
        extern int       optind;
 
        progname = strrchr(argv[0], '/');


@@ -76,7 +77,8 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

-       mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL, NULL);
+       mchars = mchars_alloc();
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, mchars, NULL);

        assert(mp);
 
        if (0 == argc)
        assert(mp);
 
        if (0 == argc)


@@ -84,10 +86,15 @@ main(int argc, char *argv[])
 
        for (i = 0; i < argc; i++) {
                mparse_reset(mp);
 
        for (i = 0; i < argc; i++) {
                mparse_reset(mp);

-               pmandoc(mp, -1, argv[i], list);
+               if (mparse_open(mp, &fd, argv[i]) != MANDOCLEVEL_OK) {
+                       perror(argv[i]);
+                       continue;
+               }
+               pmandoc(mp, fd, argv[i], list);

        }
 
        mparse_free(mp);
        }
 
        mparse_free(mp);

+       mchars_free(mchars);

        return((int)MANDOCLEVEL_OK);
 }
 
        return((int)MANDOCLEVEL_OK);
 }
 


@@ -105,12 +112,8 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list)
        struct man      *man;
        int              line, col;
 
        struct man      *man;
        int              line, col;
 

-       if (mparse_readfd(mp, fd, fn) >= MANDOCLEVEL_FATAL) {
-               fprintf(stderr, "%s: Parse failure\n", fn);
-               return;
-       }
-
-       mparse_result(mp, &mdoc, &man);
+       mparse_readfd(mp, fd, fn);
+       mparse_result(mp, &mdoc, &man, NULL);

        line = 1;
        col = 0;
 
        line = 1;
        col = 0;