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 | a90a19d8ea1fd9c75174c833a56f4c68dae450c4 (patch) | |
| tree | 6040fbeff2ceb01c795fcdc0bf917f24038e4b44 /regress/roff | |
| parent | 3cfd064738dd1ac7b31bfbb5b6eab47b4ea99b2c (diff) | |
| download | mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.tar.gz mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.tar.zst mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.zip | |
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/roff')
| -rw-r--r-- | regress/roff/args/mdoc.out_lint | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/regress/roff/args/mdoc.out_lint b/regress/roff/args/mdoc.out_lint index f4715ba2..4422d754 100644 --- a/regress/roff/args/mdoc.out_lint +++ b/regress/roff/args/mdoc.out_lint @@ -4,10 +4,14 @@ mandoc: mdoc.in:46:15: STYLE: whitespace at end of input line mandoc: mdoc.in:86:25: STYLE: whitespace at end of input line mandoc: mdoc.in:90:26: STYLE: whitespace at end of input line mandoc: mdoc.in:94:27: STYLE: whitespace at end of input line -mandoc: mdoc.in:102:9: STYLE: unterminated quoted argument -mandoc: mdoc.in:103:13: STYLE: unterminated quoted argument -mandoc: mdoc.in:107:10: STYLE: unterminated quoted argument -mandoc: mdoc.in:108:14: STYLE: unterminated quoted argument -mandoc: mdoc.in:112:11: STYLE: unterminated quoted argument -mandoc: mdoc.in:113:15: STYLE: unterminated quoted argument +mandoc: mdoc.in:102:5: STYLE: unterminated quoted argument +mandoc: mdoc.in:103:9: STYLE: unterminated quoted argument +mandoc: mdoc.in:107:5: STYLE: unterminated quoted argument +mandoc: mdoc.in:107:10: STYLE: whitespace at end of input line +mandoc: mdoc.in:108:9: STYLE: unterminated quoted argument +mandoc: mdoc.in:108:14: STYLE: whitespace at end of input line +mandoc: mdoc.in:112:5: STYLE: unterminated quoted argument +mandoc: mdoc.in:112:11: STYLE: whitespace at end of input line +mandoc: mdoc.in:113:9: STYLE: unterminated quoted argument +mandoc: mdoc.in:113:15: STYLE: whitespace at end of input line mandoc: mdoc.in:121:1: ERROR: escaped character not allowed in a name: Fl\( |