Make sure that the configuration file is always read, even when

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index a47240c42761513c62f65f05242264179da898b3..5b33edbe9cef4ef528ba141832e61b490edf52a3 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,6 +1,6 @@
-/* $Id: read.c,v 1.217 2020/04/07 22:56:02 schwarze Exp $ */
+/* $Id: read.c,v 1.220 2021/06/27 17:57:54 schwarze Exp $ */
 /*
- * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012 Joerg Sonnenberger <joerg@netbsd.org>
  *
@@ -42,12 +42,12 @@
 #include "mandoc_aux.h"
 #include "mandoc.h"
 #include "roff.h"
-#include "tag.h"
 #include "mdoc.h"
 #include "man.h"
 #include "mandoc_parse.h"
 #include "libmandoc.h"
 #include "roff_int.h"
+#include "tag.h"
 
 #define        REPARSE_LIMIT   1000
 
@@ -154,6 +154,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
        struct buf      *firstln, *lastln, *thisln, *loop;
        char            *cp;
        size_t           pos; /* byte number in the ln buffer */
+       size_t           spos; /* at the start of the current line parse */
        int              line_result, result;
        int              of;
        int              lnn; /* line number in the real file */
@@ -180,6 +181,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
                            curp->filenc & MPARSE_LATIN1)
                                curp->filenc = preconv_cue(&blk, i);
                }
+               spos = pos;
 
                while (i < blk.sz && (start || blk.buf[i] != '\0')) {
 
@@ -279,7 +281,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
 
                of = 0;
 rerun:
-               line_result = roff_parseln(curp->roff, curp->line, &ln, &of);
+               line_result = roff_parseln(curp->roff, curp->line,
+                   &ln, &of, start && spos == 0 ? pos : 0);
 
                /* Process options. */
 
@@ -554,7 +557,7 @@ mparse_readfd(struct mparse *curp, int fd, const char *filename)
 
        struct buf       blk;
        struct buf      *save_primary;
-       const char      *save_filename;
+       const char      *save_filename, *cp;
        size_t           offset;
        int              save_filenc, save_lineno;
        int              with_mmap;
@@ -562,7 +565,13 @@ mparse_readfd(struct mparse *curp, int fd, const char *filename)
        if (recursion_depth > 64) {
                mandoc_msg(MANDOCERR_ROFFLOOP, curp->line, 0, NULL);
                return;
-       }
+       } else if (recursion_depth == 0 &&
+           (cp = strrchr(filename, '.')) != NULL &&
+            cp[1] >= '1' && cp[1] <= '9')
+                curp->man->filesec = cp[1];
+        else
+                curp->man->filesec = '\0';
+
        if (read_whole_file(curp, fd, &blk, &with_mmap) == -1)
                return;
 
@@ -708,7 +717,7 @@ mparse_result(struct mparse *curp)
                        mdoc_validate(curp->man);
                else
                        man_validate(curp->man);
-               tag_postprocess(curp->man->meta.first);
+               tag_postprocess(curp->man, curp->man->meta.first);
        }
        return &curp->man->meta;
 }