diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-10-22 22:06:43 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-10-22 22:06:43 +0000 |
commit | cec89eaaf3b18d9785ee5b9565004c2a4646cecf (patch) | |
tree | 8068df1fff551d085924f3cd6f7b0485dfa37804 | |
parent | e66bc70731870e9afaa3b406e8e49e65b95bfb57 (diff) | |
download | mandoc-cec89eaaf3b18d9785ee5b9565004c2a4646cecf.tar.gz mandoc-cec89eaaf3b18d9785ee5b9565004c2a4646cecf.tar.zst mandoc-cec89eaaf3b18d9785ee5b9565004c2a4646cecf.zip |
use the new function man_validate() here, too
-rw-r--r-- | Makefile.depend | 2 | ||||
-rw-r--r-- | cgi.c | 7 | ||||
-rw-r--r-- | demandoc.c | 6 | ||||
-rw-r--r-- | mandocdb.c | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.depend b/Makefile.depend index 4cb1df3e..ed00dbb9 100644 --- a/Makefile.depend +++ b/Makefile.depend @@ -1,5 +1,5 @@ att.o: att.c config.h roff.h mdoc.h libmdoc.h -cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h main.h manconf.h mansearch.h cgi.h +cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h main.h manconf.h mansearch.h cgi.h chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h libmandoc.h compat_err.o: compat_err.c config.h compat_fgetln.o: compat_fgetln.c config.h @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.111 2015/10/20 02:01:31 schwarze Exp $ */ +/* $Id: cgi.c,v 1.112 2015/10/22 22:06:43 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@usta.de> @@ -34,6 +34,7 @@ #include "mandoc.h" #include "roff.h" #include "mdoc.h" +#include "man.h" #include "main.h" #include "manconf.h" #include "mansearch.h" @@ -860,8 +861,10 @@ format(const struct req *req, const char *file) if (man->macroset == MACROSET_MDOC) { mdoc_validate(man); html_mdoc(vp, man); - } else + } else { + man_validate(man); html_man(vp, man); + } html_free(vp); mparse_free(mp); @@ -1,4 +1,4 @@ -/* $Id: demandoc.c,v 1.23 2015/10/20 02:01:31 schwarze Exp $ */ +/* $Id: demandoc.c,v 1.24 2015/10/22 22:06:43 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -122,8 +122,10 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list) if (man->macroset == MACROSET_MDOC) { mdoc_validate(man); pmdoc(man->first->child, &line, &col, list); - } else + } else { + man_validate(man); pman(man->first->child, &line, &col, list); + } if ( ! list) putchar('\n'); @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.204 2015/10/20 02:01:31 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.205 2015/10/22 22:06:43 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1176,6 +1176,7 @@ mpages_merge(struct mparse *mp) mpage->arch == NULL ? "" : mpage->arch); mpage->title = mandoc_strdup(man->meta.title); } else if (man != NULL && man->macroset == MACROSET_MAN) { + man_validate(man); mpage->form = FORM_SRC; mpage->sec = mandoc_strdup(man->meta.msec); mpage->arch = mandoc_strdup(mlink->arch); |