CVSROOT:        /cvs
Module name:    src
Changes by:     [email protected]        2018/12/21 09:58:49

Modified files:
        usr.bin/mandoc : libmandoc.h libmdoc.h man_macro.c mdoc_argv.c 
                         mdoc_macro.c roff.c 
        regress/usr.bin/mandoc/man/RS: REarg.in REarg.out_ascii 
                                       REarg.out_lint 
        regress/usr.bin/mandoc/mdoc/Bl: Makefile 
        regress/usr.bin/mandoc/mdoc/Eo: Makefile 
        regress/usr.bin/mandoc/mdoc/Fd: Makefile 
        regress/usr.bin/mandoc/mdoc/Li: Makefile 
        regress/usr.bin/mandoc/mdoc/Ns: Makefile 
        regress/usr.bin/mandoc/mdoc/Op: Makefile 
        regress/usr.bin/mandoc/roff/args: mdoc.out_lint 
Added files:
        regress/usr.bin/mandoc/mdoc/Bl: esc.in esc.out_ascii 
                                        esc.out_markdown 
        regress/usr.bin/mandoc/mdoc/Eo: arg.in arg.out_ascii 
                                        arg.out_markdown arg.out_utf8 
        regress/usr.bin/mandoc/mdoc/Fd: arg.in arg.out_ascii 
                                        arg.out_markdown 
        regress/usr.bin/mandoc/mdoc/Li: arg.in arg.out_ascii 
                                        arg.out_markdown 
        regress/usr.bin/mandoc/mdoc/Ns: arg.in arg.out_ascii 
                                        arg.out_markdown 
        regress/usr.bin/mandoc/mdoc/Op: arg.in arg.out_ascii 
                                        arg.out_markdown 

Log message:
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.

Reply via email to