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 | |
| 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')
29 files changed, 365 insertions, 31 deletions
diff --git a/regress/man/RS/REarg.in b/regress/man/RS/REarg.in index 27af5017..7901d3cf 100644 --- a/regress/man/RS/REarg.in +++ b/regress/man/RS/REarg.in @@ -1,8 +1,9 @@ -.\" $OpenBSD: REarg.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $ -.TH RS-REARG 1 "January 24, 2015" +.\" $OpenBSD: REarg.in,v 1.4 2018/12/21 16:58:49 schwarze Exp $ +.TH RS-REARG 1 "December 21, 2018" .SH NAME RS-REarg \- arguments to the RE macro .SH DESCRIPTION +.nr one 1 level 1 .RS 4n 2i level 2 @@ -10,13 +11,13 @@ level 2 level 3 .RE 2a back to 2 -.RE 1b +.RE \n[one]b back to 1 .RS 4n level 2 .RS 2n level 3 -.RE 1c +.RE "\\n[one]c" back to 1 .RS 4n level 2 @@ -24,4 +25,4 @@ level 2 level 3 .RE 0d back to 1 -.RE 1e +.RE \\n[one]e diff --git a/regress/man/RS/REarg.out_ascii b/regress/man/RS/REarg.out_ascii index 747e037b..45326a88 100644 --- a/regress/man/RS/REarg.out_ascii +++ b/regress/man/RS/REarg.out_ascii @@ -20,4 +20,4 @@ DDEESSCCRRIIPPTTIIOONN -OpenBSD January 24, 2015 RS-REARG(1) +OpenBSD December 21, 2018 RS-REARG(1) 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 diff --git a/regress/mdoc/Bl/Makefile b/regress/mdoc/Bl/Makefile index aeb6bd56..8fde5d9e 100644 --- a/regress/mdoc/Bl/Makefile +++ b/regress/mdoc/Bl/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.31 2016/10/17 19:00:16 schwarze Exp $ +# $OpenBSD: Makefile,v 1.40 2018/12/21 16:58:49 schwarze Exp $ REGRESS_TARGETS = item inset diag ohang bullet dash enum hang tag REGRESS_TARGETS += column column_nogroff colNoIt -REGRESS_TARGETS += extend nested offset secstart +REGRESS_TARGETS += esc extend nested offset secstart REGRESS_TARGETS += notype multitype badargs REGRESS_TARGETS += empty noIt emptyhead emptytag emptyitem multitag diff --git a/regress/mdoc/Bl/esc.in b/regress/mdoc/Bl/esc.in new file mode 100644 index 00000000..343ccc7d --- /dev/null +++ b/regress/mdoc/Bl/esc.in @@ -0,0 +1,19 @@ +.\" $OpenBSD: esc.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt BL-ESC 1 +.Os +.Sh NAME +.Nm Bl-esc +.Nd escape sequences in full block macro heads +.Sh DESCRIPTION +.ds a \(at +.Bl -tag -width 2n +.It \*a +unquoted unescaped +.It "\*a" +quoted unescaped +.It \\*a +unquoted escaped +.It "\\*a" +quoted escaped +.El diff --git a/regress/mdoc/Bl/esc.out_ascii b/regress/mdoc/Bl/esc.out_ascii new file mode 100644 index 00000000..e73c929f --- /dev/null +++ b/regress/mdoc/Bl/esc.out_ascii @@ -0,0 +1,15 @@ +BL-ESC(1) General Commands Manual BL-ESC(1) + +NNAAMMEE + BBll--eesscc - escape sequences in full block macro heads + +DDEESSCCRRIIPPTTIIOONN + @ unquoted unescaped + + @ quoted unescaped + + @ unquoted escaped + + @ quoted escaped + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Bl/esc.out_markdown b/regress/mdoc/Bl/esc.out_markdown new file mode 100644 index 00000000..780a61b8 --- /dev/null +++ b/regress/mdoc/Bl/esc.out_markdown @@ -0,0 +1,25 @@ +BL-ESC(1) - General Commands Manual + +# NAME + +**Bl-esc** - escape sequences in full block macro heads + +# DESCRIPTION + +@ + +> unquoted unescaped + +@ + +> quoted unescaped + +@ + +> unquoted escaped + +@ + +> quoted escaped + +OpenBSD - December 21, 2018 diff --git a/regress/mdoc/Eo/Makefile b/regress/mdoc/Eo/Makefile index 0034e271..1e101ace 100644 --- a/regress/mdoc/Eo/Makefile +++ b/regress/mdoc/Eo/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2015/02/11 14:14:53 schwarze Exp $ +# $OpenBSD: Makefile,v 1.8 2018/12/21 16:58:49 schwarze Exp $ -REGRESS_TARGETS = break empty obsolete unclosed +REGRESS_TARGETS = arg break empty obsolete unclosed +UTF8_TARGETS = arg LINT_TARGETS = break obsolete unclosed # groff-1.22.3 defect: diff --git a/regress/mdoc/Eo/arg.in b/regress/mdoc/Eo/arg.in new file mode 100644 index 00000000..dd7928a7 --- /dev/null +++ b/regress/mdoc/Eo/arg.in @@ -0,0 +1,25 @@ +.\" $OpenBSD: arg.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt EO-ARG 1 +.Os +.Sh NAME +.Nm Eo-arg +.Nd escapes in arguments of enclosure macros +.Sh DESCRIPTION +.ds o \(Fo +.ds c \(Fc +.Eo \*o +unquoted unescaped +.Ec \*c +.Pp +.Eo "\*o" +quoted unescaped +.Ec "\*c" +.Pp +.Eo \\*o +unquoted escaped +.Ec \\*c +.Pp +.Eo "\\*o" +quoted escaped +.Ec "\\*c" diff --git a/regress/mdoc/Eo/arg.out_ascii b/regress/mdoc/Eo/arg.out_ascii new file mode 100644 index 00000000..004c3fe5 --- /dev/null +++ b/regress/mdoc/Eo/arg.out_ascii @@ -0,0 +1,15 @@ +EO-ARG(1) General Commands Manual EO-ARG(1) + +NNAAMMEE + EEoo--aarrgg - escapes in arguments of enclosure macros + +DDEESSCCRRIIPPTTIIOONN + <<unquoted unescaped>> + + <<quoted unescaped>> + + <<unquoted escaped>> + + <<quoted escaped>> + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Eo/arg.out_markdown b/regress/mdoc/Eo/arg.out_markdown new file mode 100644 index 00000000..9da6ff4f --- /dev/null +++ b/regress/mdoc/Eo/arg.out_markdown @@ -0,0 +1,17 @@ +EO-ARG(1) - General Commands Manual + +# NAME + +**Eo-arg** - escapes in arguments of enclosure macros + +# DESCRIPTION + +«unquoted unescaped» + +«quoted unescaped» + +«unquoted escaped» + +«quoted escaped» + +OpenBSD - December 21, 2018 diff --git a/regress/mdoc/Eo/arg.out_utf8 b/regress/mdoc/Eo/arg.out_utf8 new file mode 100644 index 00000000..3b4a30bd --- /dev/null +++ b/regress/mdoc/Eo/arg.out_utf8 @@ -0,0 +1,15 @@ +EO-ARG(1) General Commands Manual EO-ARG(1) + +NNAAMMEE + EEoo--aarrgg – escapes in arguments of enclosure macros + +DDEESSCCRRIIPPTTIIOONN + «unquoted unescaped» + + «quoted unescaped» + + «unquoted escaped» + + «quoted escaped» + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Fd/Makefile b/regress/mdoc/Fd/Makefile index 7cd78c65..39b07f1d 100644 --- a/regress/mdoc/Fd/Makefile +++ b/regress/mdoc/Fd/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2015/02/06 03:31:11 schwarze Exp $ +# $OpenBSD: Makefile,v 1.7 2018/12/21 16:58:49 schwarze Exp $ -REGRESS_TARGETS = break empty eos font +REGRESS_TARGETS = arg break empty eos font LINT_TARGETS = empty SKIP_TMAN = eos diff --git a/regress/mdoc/Fd/arg.in b/regress/mdoc/Fd/arg.in new file mode 100644 index 00000000..659d03c9 --- /dev/null +++ b/regress/mdoc/Fd/arg.in @@ -0,0 +1,16 @@ +.\" $OpenBSD: arg.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt FD-ARG 2 +.Os +.Sh NAME +.Nm Fd-arg +.Nd escape sequences in the arguments of in-line EOL macros +.Sh DESCRIPTION +.ds s \(sh +.Fd \*sunquoted unescaped +.Pp +.Fd "\*squoted" unescaped +.Pp +.Fd \\*sunquoted escaped +.Pp +.Fd "\\*squoted" escaped 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 diff --git a/regress/mdoc/Fd/arg.out_markdown b/regress/mdoc/Fd/arg.out_markdown new file mode 100644 index 00000000..14dba6fc --- /dev/null +++ b/regress/mdoc/Fd/arg.out_markdown @@ -0,0 +1,17 @@ +FD-ARG(2) - System Calls Manual + +# NAME + +**Fd-arg** - escape sequences in the arguments of in-line EOL macros + +# DESCRIPTION + +**#unquoted unescaped** + +**#quoted unescaped** + +**#unquoted escaped** + +**#quoted escaped** + +OpenBSD - December 21, 2018 diff --git a/regress/mdoc/Li/Makefile b/regress/mdoc/Li/Makefile index f5afd199..7b2a3313 100644 --- a/regress/mdoc/Li/Makefile +++ b/regress/mdoc/Li/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2014/07/02 20:18:42 schwarze Exp $ +# $OpenBSD: Makefile,v 1.7 2018/12/21 16:58:49 schwarze Exp $ -REGRESS_TARGETS = punct font +REGRESS_TARGETS = arg punct font LINT_TARGETS = punct .include <bsd.regress.mk> diff --git a/regress/mdoc/Li/arg.in b/regress/mdoc/Li/arg.in new file mode 100644 index 00000000..d6c80672 --- /dev/null +++ b/regress/mdoc/Li/arg.in @@ -0,0 +1,20 @@ +.\" $OpenBSD: arg.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt LI-ARG 1 +.Os +.Sh NAME +.Nm Li-arg +.Nd escape sequences in arguments of in-line macros +.Sh DESCRIPTION +.ds a \(at +unquoted unescaped: +.Li \*a +.Pp +quoted unescaped: +.Li "\*a" +.Pp +unquoted escaped: +.Li \\*a +.Pp +quoted escaped: +.Li "\\*a" diff --git a/regress/mdoc/Li/arg.out_ascii b/regress/mdoc/Li/arg.out_ascii new file mode 100644 index 00000000..f0a69f18 --- /dev/null +++ b/regress/mdoc/Li/arg.out_ascii @@ -0,0 +1,15 @@ +LI-ARG(1) General Commands Manual LI-ARG(1) + +NNAAMMEE + LLii--aarrgg - escape sequences in arguments of in-line macros + +DDEESSCCRRIIPPTTIIOONN + unquoted unescaped: @ + + quoted unescaped: @ + + unquoted escaped: @ + + quoted escaped: @ + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Li/arg.out_markdown b/regress/mdoc/Li/arg.out_markdown new file mode 100644 index 00000000..1b0ba54e --- /dev/null +++ b/regress/mdoc/Li/arg.out_markdown @@ -0,0 +1,21 @@ +LI-ARG(1) - General Commands Manual + +# NAME + +**Li-arg** - escape sequences in arguments of in-line macros + +# DESCRIPTION + +unquoted unescaped: +`@` + +quoted unescaped: +`@` + +unquoted escaped: +`@` + +quoted escaped: +`@` + +OpenBSD - December 21, 2018 diff --git a/regress/mdoc/Ns/Makefile b/regress/mdoc/Ns/Makefile index 45db66cc..b2c409ab 100644 --- a/regress/mdoc/Ns/Makefile +++ b/regress/mdoc/Ns/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.5 2014/07/02 11:42:56 schwarze Exp $ +# $OpenBSD: Makefile,v 1.8 2018/12/21 16:58:49 schwarze Exp $ -REGRESS_TARGETS = position punct +REGRESS_TARGETS = arg position punct LINT_TARGETS = position .include <bsd.regress.mk> diff --git a/regress/mdoc/Ns/arg.in b/regress/mdoc/Ns/arg.in new file mode 100644 index 00000000..b83a1f4a --- /dev/null +++ b/regress/mdoc/Ns/arg.in @@ -0,0 +1,13 @@ +.\" $OpenBSD: arg.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt NS-ARG 1 +.Os +.Sh NAME +.Nm Ns-arg +.Nd escape sequences in the arguments of in-line macros with an argument limit +.Sh DESCRIPTION +.ds a \(at +.No unquoted unescaped Ns \*a +.No quoted unescaped Ns "\*a" +.No unquoted escaped Ns \\*a +.No quoted escaped Ns "\\*a" diff --git a/regress/mdoc/Ns/arg.out_ascii b/regress/mdoc/Ns/arg.out_ascii new file mode 100644 index 00000000..2b8a5104 --- /dev/null +++ b/regress/mdoc/Ns/arg.out_ascii @@ -0,0 +1,10 @@ +NS-ARG(1) General Commands Manual NS-ARG(1) + +NNAAMMEE + NNss--aarrgg - escape sequences in the arguments of in-line macros with an + argument limit + +DDEESSCCRRIIPPTTIIOONN + unquoted unescaped@ quoted unescaped@ unquoted escaped@ quoted escaped@ + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Ns/arg.out_markdown b/regress/mdoc/Ns/arg.out_markdown new file mode 100644 index 00000000..7d600590 --- /dev/null +++ b/regress/mdoc/Ns/arg.out_markdown @@ -0,0 +1,14 @@ +NS-ARG(1) - General Commands Manual + +# NAME + +**Ns-arg** - escape sequences in the arguments of in-line macros with an argument limit + +# DESCRIPTION + +unquoted unescaped@ +quoted unescaped@ +unquoted escaped@ +quoted escaped@ + +OpenBSD - December 21, 2018 diff --git a/regress/mdoc/Op/Makefile b/regress/mdoc/Op/Makefile index 4a2d6fda..b2a79566 100644 --- a/regress/mdoc/Op/Makefile +++ b/regress/mdoc/Op/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2014/07/02 11:42:56 schwarze Exp $ +# $OpenBSD: Makefile,v 1.7 2018/12/21 16:58:49 schwarze Exp $ -REGRESS_TARGETS = break broken punct +REGRESS_TARGETS = arg break broken punct LINT_TARGETS = break broken punct SKIP_GROFF = break diff --git a/regress/mdoc/Op/arg.in b/regress/mdoc/Op/arg.in new file mode 100644 index 00000000..2043b01e --- /dev/null +++ b/regress/mdoc/Op/arg.in @@ -0,0 +1,20 @@ +.\" $OpenBSD: arg.in,v 1.1 2018/12/21 16:58:49 schwarze Exp $ +.Dd $Mdocdate: December 21 2018 $ +.Dt OP-ARG 1 +.Os +.Sh NAME +.Nm Op-arg +.Nd escape sequences in the arguments of partial implicit macros +.Sh DESCRIPTION +.ds a \(at +unquoted unescaped: +.Op \*a +.Pp +quoted unescaped: +.Op "\*a" +.Pp +unquoted escaped: +.Op \\*a +.Pp +quoted escaped: +.Op "\\*a" diff --git a/regress/mdoc/Op/arg.out_ascii b/regress/mdoc/Op/arg.out_ascii new file mode 100644 index 00000000..534917cb --- /dev/null +++ b/regress/mdoc/Op/arg.out_ascii @@ -0,0 +1,15 @@ +OP-ARG(1) General Commands Manual OP-ARG(1) + +NNAAMMEE + OOpp--aarrgg - escape sequences in the arguments of partial implicit macros + +DDEESSCCRRIIPPTTIIOONN + unquoted unescaped: [@] + + quoted unescaped: [@] + + unquoted escaped: [@] + + quoted escaped: [@] + +OpenBSD December 21, 2018 OpenBSD diff --git a/regress/mdoc/Op/arg.out_markdown b/regress/mdoc/Op/arg.out_markdown new file mode 100644 index 00000000..5ad86f7d --- /dev/null +++ b/regress/mdoc/Op/arg.out_markdown @@ -0,0 +1,21 @@ +OP-ARG(1) - General Commands Manual + +# NAME + +**Op-arg** - escape sequences in the arguments of partial implicit macros + +# DESCRIPTION + +unquoted unescaped: +\[@] + +quoted unescaped: +\[@] + +unquoted escaped: +\[@] + +quoted escaped: +\[@] + +OpenBSD - December 21, 2018 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\( |