From a90a19d8ea1fd9c75174c833a56f4c68dae450c4 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/man/RS/REarg.out_lint | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'regress/man/RS/REarg.out_lint') diff --git a/regress/man/RS/REarg.out_lint b/regress/man/RS/REarg.out_lint index 457ccb15..a912a7e5 100644 --- a/regress/man/RS/REarg.out_lint +++ b/regress/man/RS/REarg.out_lint @@ -1,7 +1,7 @@ -mandoc: REarg.in:7:8: ERROR: skipping excess arguments: RS ... 2i -mandoc: REarg.in:11:6: ERROR: skipping excess arguments: RE ... a -mandoc: REarg.in:13:6: ERROR: skipping excess arguments: RE ... b -mandoc: REarg.in:19:6: ERROR: skipping excess arguments: RE ... c -mandoc: REarg.in:25:6: ERROR: skipping excess arguments: RE ... d -mandoc: REarg.in:27:6: ERROR: skipping excess arguments: RE ... e -mandoc: REarg.in:27:2: ERROR: fewer RS blocks open, skipping: RE 1 +mandoc: REarg.in:8:8: ERROR: skipping excess arguments: RS ... 2i +mandoc: REarg.in:12:6: ERROR: skipping excess arguments: RE ... a +mandoc: REarg.in:14:6: ERROR: skipping excess arguments: RE ... b +mandoc: REarg.in:20:7: ERROR: skipping excess arguments: RE ... c +mandoc: REarg.in:26:6: ERROR: skipping excess arguments: RE ... d +mandoc: REarg.in:28:6: ERROR: skipping excess arguments: RE ... e +mandoc: REarg.in:28:2: ERROR: fewer RS blocks open, skipping: RE 1 -- cgit v1.2.3-56-ge451