diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-10-20 02:00:49 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-10-20 02:00:49 +0000 |
| commit | 396853b526c3389a2b49063c0b63952f1e01deef (patch) | |
| tree | a14aac13fc173e8a4780664d4f1961a184011ea9 /usr.bin/mandoc/cgi.c | |
| parent | Always allow the setsockopt & getsockopt system calls... however, in the (diff) | |
| download | wireguard-openbsd-396853b526c3389a2b49063c0b63952f1e01deef.tar.xz wireguard-openbsd-396853b526c3389a2b49063c0b63952f1e01deef.zip | |
In order to become able to generate syntax tree nodes on the roff(7)
level, validation must be separated from parsing and rewinding.
This first big step moves calling of the mdoc(7) post_*() functions
out of the parser loop into their own mdoc_validate() pass, while
using a new mdoc_state() module to make syntax tree state handling
available to both the parser loop and the validation pass.
Diffstat (limited to 'usr.bin/mandoc/cgi.c')
| -rw-r--r-- | usr.bin/mandoc/cgi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c index b2fc30caf16..f1e65e160e1 100644 --- a/usr.bin/mandoc/cgi.c +++ b/usr.bin/mandoc/cgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgi.c,v 1.49 2015/10/13 22:57:49 schwarze Exp $ */ +/* $OpenBSD: cgi.c,v 1.50 2015/10/20 02:00:49 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@usta.de> @@ -31,6 +31,7 @@ #include "mandoc_aux.h" #include "mandoc.h" #include "roff.h" +#include "mdoc.h" #include "main.h" #include "manconf.h" #include "mansearch.h" @@ -854,9 +855,10 @@ format(const struct req *req, const char *file) vp = html_alloc(&conf); - if (man->macroset == MACROSET_MDOC) + if (man->macroset == MACROSET_MDOC) { + mdoc_validate(man); html_mdoc(vp, man); - else + } else html_man(vp, man); html_free(vp); |