===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/cgi.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -c -r1.72 -r1.73
*** src/usr.bin/mandoc/cgi.c	2016/07/09 19:44:52	1.72
--- src/usr.bin/mandoc/cgi.c	2016/07/10 10:03:15	1.73
***************
*** 1,4 ****
! /*	$OpenBSD: cgi.c,v 1.72 2016/07/09 19:44:52 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
--- 1,4 ----
! /*	$OpenBSD: cgi.c,v 1.73 2016/07/10 10:03:15 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
***************
*** 468,476 ****
  {
  	size_t	 i;
  
- 	if ( ! strcmp(manpath, "mandoc"))
- 		return 1;
- 
  	for (i = 0; i < req->psz; i++)
  		if ( ! strcmp(manpath, req->p[i]))
  			return 1;
--- 468,473 ----
***************
*** 497,505 ****
  	resp_searchform(req, FOCUS_QUERY);
  	printf("<p>\n"
  	       "This web interface is documented in the\n"
! 	       "<a href=\"/%s%smandoc/man8/man.cgi.8\">man.cgi</a>\n"
  	       "manual, and the\n"
! 	       "<a href=\"/%s%smandoc/man1/apropos.1\">apropos</a>\n"
  	       "manual explains the query syntax.\n"
  	       "</p>\n",
  	       scriptname, *scriptname == '\0' ? "" : "/",
--- 494,502 ----
  	resp_searchform(req, FOCUS_QUERY);
  	printf("<p>\n"
  	       "This web interface is documented in the\n"
! 	       "<a href=\"/%s%sman.cgi.8\">man.cgi(8)</a>\n"
  	       "manual, and the\n"
! 	       "<a href=\"/%s%sapropos.1\">apropos(1)</a>\n"
  	       "manual explains the query syntax.\n"
  	       "</p>\n",
  	       scriptname, *scriptname == '\0' ? "" : "/",
***************
*** 882,893 ****
  		free(manpath);
  		return;
  	}
! 
! 	if (strcmp(manpath, "mandoc")) {
! 		free(req->q.manpath);
! 		req->q.manpath = manpath;
! 	} else
! 		free(manpath);
  
  	if ( ! validate_filename(file)) {
  		pg_error_badrequest(
--- 879,885 ----
  		free(manpath);
  		return;
  	}
! 	free(manpath);
  
  	if ( ! validate_filename(file)) {
  		pg_error_badrequest(