Now that the NODE_NOFILL flag in the syntax tree is accurate,

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 21a80269f90f629492fb99604be52090d7cd7aa4..afafcdb59c8c1a2bab35db75a5afc1459a9db8d2 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.206 2018/12/14 05:18:03 schwarze Exp $ */
+/*     $Id: read.c,v 1.210 2018/12/31 04:55:47 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -47,7 +47,6 @@
 struct mparse {
        struct roff      *roff; /* roff parser (!NULL) */
        struct roff_man  *man; /* man parser */
-       char             *sodest; /* filename pointed to by .so */
        struct buf       *primary; /* buffer currently being parsed */
        struct buf       *secondary; /* copy of top level input */
        struct buf       *loop; /* open .while request line */
@@ -123,15 +122,15 @@ choose_parser(struct mparse *curp)
        }
 
        if (format == MPARSE_MDOC) {
-               curp->man->macroset = MACROSET_MDOC;
+               curp->man->meta.macroset = MACROSET_MDOC;
                if (curp->man->mdocmac == NULL)
                        curp->man->mdocmac = roffhash_alloc(MDOC_Dd, MDOC_MAX);
        } else {
-               curp->man->macroset = MACROSET_MAN;
+               curp->man->meta.macroset = MACROSET_MAN;
                if (curp->man->manmac == NULL)
                        curp->man->manmac = roffhash_alloc(MAN_TH, MAN_MAX);
        }
-       curp->man->first->tok = TOKEN_NONE;
+       curp->man->meta.first->tok = TOKEN_NONE;
 }
 
 /*
@@ -334,9 +333,9 @@ rerun:
                case ROFF_IGN:
                        break;
                case ROFF_CONT:
-                       if (curp->man->macroset == MACROSET_NONE)
+                       if (curp->man->meta.macroset == MACROSET_NONE)
                                choose_parser(curp);
-                       if ((curp->man->macroset == MACROSET_MDOC ?
+                       if ((curp->man->meta.macroset == MACROSET_MDOC ?
                             mdoc_parseln(curp->man, curp->line, ln.buf, of) :
                             man_parseln(curp->man, curp->line, ln.buf, of)
                            ) == 2)
@@ -365,15 +364,17 @@ rerun:
                case ROFF_SO:
                        if ( ! (curp->options & MPARSE_SO) &&
                            (i >= blk.sz || blk.buf[i] == '\0')) {
-                               curp->sodest = mandoc_strdup(ln.buf + of);
+                               curp->man->meta.sodest =
+                                   mandoc_strdup(ln.buf + of);
                                goto out;
                        }
                        if ((fd = mparse_open(curp, ln.buf + of)) != -1) {
                                mparse_readfd(curp, fd, ln.buf + of);
                                close(fd);
                        } else {
-                               mandoc_msg(MANDOCERR_SO_FAIL, curp->line,
-                                   pos, ".so %s", ln.buf + of);
+                               mandoc_msg(MANDOCERR_SO_FAIL,
+                                   curp->line, of, ".so %s: %s",
+                                   ln.buf + of, strerror(errno));
                                ln.sz = mandoc_asprintf(&cp,
                                    ".sp\nSee the file %s.\n.sp",
                                    ln.buf + of);
@@ -525,9 +526,9 @@ read_whole_file(struct mparse *curp, int fd, struct buf *fb, int *with_mmap)
 static void
 mparse_end(struct mparse *curp)
 {
-       if (curp->man->macroset == MACROSET_NONE)
-               curp->man->macroset = MACROSET_MAN;
-       if (curp->man->macroset == MACROSET_MDOC)
+       if (curp->man->meta.macroset == MACROSET_NONE)
+               curp->man->meta.macroset = MACROSET_MAN;
+       if (curp->man->meta.macroset == MACROSET_MDOC)
                mdoc_endparse(curp->man);
        else
                man_endparse(curp->man);
@@ -633,7 +634,6 @@ mparse_open(struct mparse *curp, const char *file)
 
        /* Neither worked, give up. */
 
-       mandoc_msg(MANDOCERR_FILE, 0, 0, "%s", strerror(errno));
        return -1;
 }
 
@@ -647,19 +647,19 @@ mparse_alloc(int options, enum mandoc_os os_e, const char *os_s)
        curp->options = options;
        curp->os_s = os_s;
 
-       curp->roff = roff_alloc(curp, options);
-       curp->man = roff_man_alloc(curp->roff, curp, curp->os_s,
+       curp->roff = roff_alloc(options);
+       curp->man = roff_man_alloc(curp->roff, curp->os_s,
                curp->options & MPARSE_QUICK ? 1 : 0);
        if (curp->options & MPARSE_MDOC) {
-               curp->man->macroset = MACROSET_MDOC;
+               curp->man->meta.macroset = MACROSET_MDOC;
                if (curp->man->mdocmac == NULL)
                        curp->man->mdocmac = roffhash_alloc(MDOC_Dd, MDOC_MAX);
        } else if (curp->options & MPARSE_MAN) {
-               curp->man->macroset = MACROSET_MAN;
+               curp->man->meta.macroset = MACROSET_MAN;
                if (curp->man->manmac == NULL)
                        curp->man->manmac = roffhash_alloc(MAN_TH, MAN_MAX);
        }
-       curp->man->first->tok = TOKEN_NONE;
+       curp->man->meta.first->tok = TOKEN_NONE;
        curp->man->meta.os_e = os_e;
        return curp;
 }
@@ -671,8 +671,6 @@ mparse_reset(struct mparse *curp)
        roff_man_reset(curp->man);
        free_buf_list(curp->secondary);
        curp->secondary = NULL;
-       free(curp->sodest);
-       curp->sodest = NULL;
        curp->gzip = 0;
 }
 
@@ -684,21 +682,20 @@ mparse_free(struct mparse *curp)
        roff_man_free(curp->man);
        roff_free(curp->roff);
        free_buf_list(curp->secondary);
-       free(curp->sodest);
        free(curp);
 }
 
-void
-mparse_result(struct mparse *curp, struct roff_man **man,
-       char **sodest)
+struct roff_meta *
+mparse_result(struct mparse *curp)
 {
-
-       if (sodest && NULL != (*sodest = curp->sodest)) {
-               *man = NULL;
-               return;
+       roff_state_reset(curp->man);
+       if (curp->options & MPARSE_VALIDATE) {
+               if (curp->man->meta.macroset == MACROSET_MDOC)
+                       mdoc_validate(curp->man);
+               else
+                       man_validate(curp->man);
        }
-       if (man)
-               *man = curp->man;
+       return &curp->man->meta;
 }
 
 void