===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/cgi.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -c -r1.101 -r1.102
*** src/usr.bin/mandoc/cgi.c	2018/12/14 01:17:46	1.101
--- src/usr.bin/mandoc/cgi.c	2018/12/30 00:48:47	1.102
***************
*** 1,4 ****
! /*	$OpenBSD: cgi.c,v 1.101 2018/12/14 01:17:46 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017, 2018 Ingo Schwarze <schwarze@usta.de>
--- 1,4 ----
! /*	$OpenBSD: cgi.c,v 1.102 2018/12/30 00:48:47 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017, 2018 Ingo Schwarze <schwarze@usta.de>
***************
*** 845,851 ****
  {
  	struct manoutput conf;
  	struct mparse	*mp;
! 	struct roff_man	*man;
  	void		*vp;
  	int		 fd;
  	int		 usepath;
--- 845,851 ----
  {
  	struct manoutput conf;
  	struct mparse	*mp;
! 	struct roff_meta *meta;
  	void		*vp;
  	int		 fd;
  	int		 usepath;
***************
*** 856,865 ****
  	}
  
  	mchars_alloc();
! 	mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1,
! 	    MANDOC_OS_OTHER, req->q.manpath);
  	mparse_readfd(mp, fd, file);
  	close(fd);
  
  	memset(&conf, 0, sizeof(conf));
  	conf.fragment = 1;
--- 856,866 ----
  	}
  
  	mchars_alloc();
! 	mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 |
! 	    MPARSE_VALIDATE, MANDOC_OS_OTHER, req->q.manpath);
  	mparse_readfd(mp, fd, file);
  	close(fd);
+ 	meta = mparse_result(mp);
  
  	memset(&conf, 0, sizeof(conf));
  	conf.fragment = 1;
***************
*** 870,893 ****
  	    scriptname, *scriptname == '\0' ? "" : "/",
  	    usepath ? req->q.manpath : "", usepath ? "/" : "");
  
- 	mparse_result(mp, &man, NULL);
- 	if (man == NULL) {
- 		warnx("fatal mandoc error: %s/%s", req->q.manpath, file);
- 		pg_error_internal();
- 		mparse_free(mp);
- 		mchars_free();
- 		return;
- 	}
- 
  	vp = html_alloc(&conf);
! 
! 	if (man->macroset == MACROSET_MDOC) {
! 		mdoc_validate(man);
! 		html_mdoc(vp, man);
! 	} else {
! 		man_validate(man);
! 		html_man(vp, man);
! 	}
  
  	html_free(vp);
  	mparse_free(mp);
--- 871,881 ----
  	    scriptname, *scriptname == '\0' ? "" : "/",
  	    usepath ? req->q.manpath : "", usepath ? "/" : "");
  
  	vp = html_alloc(&conf);
! 	if (meta->macroset == MACROSET_MDOC)
! 		html_mdoc(vp, meta);
! 	else
! 		html_man(vp, meta);
  
  	html_free(vp);
  	mparse_free(mp);