From aa202260e540ec4a7df78e75b104f0a1c7d0c197 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 21 Dec 2018 17:15:18 +0000 Subject: 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 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. --- regress/roff/args/mdoc.out_lint | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'regress/roff/args') 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\( -- cgit