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/mdoc/Fd/arg.out_ascii | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 regress/mdoc/Fd/arg.out_ascii (limited to 'regress/mdoc/Fd/arg.out_ascii') 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 -- cgit v1.2.3-56-ge451