do not crash when a tbl(7) cell uses roman font

[mandoc.git] / demandoc.c

diff --git a/demandoc.c b/demandoc.c
index a51c8cca059e78fdda28dee353c9254b6ffed999..57d0cc5f4120dee213091c638803161c87948ea2 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.20 2015/04/18 17:53:21 schwarze Exp $ */
+/*     $Id: demandoc.c,v 1.33 2019/03/03 11:01:15 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -20,16 +20,16 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
 #include "roff.h"
 #include "man.h"
 #include "mdoc.h"
-#include "mandoc.h"
+#include "mandoc_parse.h"
 
 static void     pline(int, int *, int *, int);
 static void     pman(const struct roff_node *, int *, int *, int);
@@ -44,7 +44,6 @@ int
 main(int argc, char *argv[])
 {
        struct mparse   *mp;
-       struct mchars   *mchars;
        int              ch, fd, i, list;
        extern int       optind;
 
@@ -73,14 +72,15 @@ main(int argc, char *argv[])
                        break;
                default:
                        usage();
-                       return((int)MANDOCLEVEL_BADARG);
+                       return (int)MANDOCLEVEL_BADARG;
                }
 
        argc -= optind;
        argv += optind;
 
-       mchars = mchars_alloc();
-       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, mchars, NULL);
+       mchars_alloc();
+       mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 |
+           MPARSE_VALIDATE, MANDOC_OS_OTHER, NULL);
        assert(mp);
 
        if (argc < 1)
@@ -88,7 +88,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,8 +96,8 @@ main(int argc, char *argv[])
        }
 
        mparse_free(mp);
-       mchars_free(mchars);
-       return((int)MANDOCLEVEL_OK);
+       mchars_free();
+       return (int)MANDOCLEVEL_OK;
 }
 
 static void
@@ -110,20 +110,19 @@ usage(void)
 static void
 pmandoc(struct mparse *mp, int fd, const char *fn, int list)
 {
-       struct roff_man *man;
+       struct roff_meta        *meta;
        int              line, col;
 
        mparse_readfd(mp, fd, fn);
-       mparse_result(mp, &man, NULL);
+       close(fd);
+       meta = mparse_result(mp);
        line = 1;
        col = 0;
 
-       if (man == NULL)
-               return;
-       if (man->macroset == MACROSET_MDOC)
-               pmdoc(man->first->child, &line, &col, list);
+       if (meta->macroset == MACROSET_MDOC)
+               pmdoc(meta->first->child, &line, &col, list);
        else
-               pman(man->first->child, &line, &col, list);
+               pman(meta->first->child, &line, &col, list);
 
        if ( ! list)
                putchar('\n');
@@ -237,7 +236,7 @@ pmdoc(const struct roff_node *p, int *line, int *col, int list)
 {
 
        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 +250,7 @@ pman(const struct roff_node *p, int *line, int *col, int list)
 {
 
        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);