diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2018-12-21 17:15:18 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-12-21 17:15:18 +0000 |
| commit | aa202260e540ec4a7df78e75b104f0a1c7d0c197 (patch) | |
| tree | 7026ff0235f04dfac31019e6937889dc71cbf161 /libmandoc.h | |
| parent | beeeef576df2a17cc8bdf0191709fa80bd2f524c (diff) | |
| download | mandoc-aa202260e540ec4a7df78e75b104f0a1c7d0c197.tar.gz | |
Rename mandoc_getarg() to roff_getarg() and pass it the roff parser
struct as an argument such that after copy-in, it can call roff_expand()
once again, which used to be called roff_res() before this. This
fixes a subtle low-level roff(7) parsing bug reported by Fabio
Scotoni <fabio at esse dot ch> in the 4.4BSD-Lite2 mdoc.samples(7)
manual page, because that page used an escaped escape sequence in
a macro argument.
To expand escaped escape sequences in quoted mdoc(7) arguments, too,
stop bypassing the call to roff_getarg() in mdoc_argv.c, function args()
for this case. This does not solve the case of escaped escape sequences
in quoted .Bl -column phrases yet.
Because roff_expand() can make the string longer, roff_getarg() can no
longer operate in-place but needs to malloc(3) the returned string.
In the high-level parsers, free(3) that string after processing it.
Diffstat (limited to 'libmandoc.h')
| -rw-r--r-- | libmandoc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmandoc.h b/libmandoc.h index c2422590..ad76f021 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -48,7 +48,6 @@ struct buf { struct roff; struct roff_man; -char *mandoc_getarg(char **, int, int *); char *mandoc_normdate(struct roff_man *, char *, int, int); int mandoc_eos(const char *, size_t); int mandoc_strntoi(const char *, size_t, int); @@ -76,6 +75,7 @@ void roff_endparse(struct roff *); void roff_setreg(struct roff *, const char *, int, char sign); int roff_getreg(struct roff *, const char *); char *roff_strdup(const struct roff *, const char *); +char *roff_getarg(struct roff *, char **, int, int *); int roff_getcontrol(const struct roff *, const char *, int *); int roff_getformat(const struct roff *); |