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 /regress/mdoc/Fd/arg.out_ascii | |
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 'regress/mdoc/Fd/arg.out_ascii')
-rw-r--r-- | regress/mdoc/Fd/arg.out_ascii | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/regress/mdoc/Fd/arg.out_ascii b/regress/mdoc/Fd/arg.out_ascii new file mode 100644 index 00000000..42836e61 --- /dev/null +++ b/regress/mdoc/Fd/arg.out_ascii @@ -0,0 +1,15 @@ +FD-ARG(2) System Calls Manual FD-ARG(2) + +NNAAMMEE + FFdd--aarrgg - escape sequences in the arguments of in-line EOL macros + +DDEESSCCRRIIPPTTIIOONN + ##uunnqquuootteedd uunneessccaappeedd + + ##qquuootteedd uunneessccaappeedd + + ##uunnqquuootteedd eessccaappeedd + + ##qquuootteedd eessccaappeedd + +OpenBSD December 21, 2018 OpenBSD |