merge OpenBSD commit by jmc@:

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 03a71c33e5a574ee05b0d8eea30a5e91c060e113..5b33edbe9cef4ef528ba141832e61b490edf52a3 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/* $Id: read.c,v 1.219 2020/04/24 12:02:33 schwarze Exp $ */
+/* $Id: read.c,v 1.220 2021/06/27 17:57:54 schwarze Exp $ */
 /*
  * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -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. */