===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.131
retrieving revision 1.134
diff -u -p -r1.131 -r1.134
--- mandoc/cgi.c	2016/04/29 10:45:36	1.131
+++ mandoc/cgi.c	2016/07/10 10:05:33	1.134
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.131 2016/04/29 10:45:36 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.134 2016/07/10 10:05:33 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
@@ -385,8 +385,7 @@ resp_searchform(const struct req *req, enum focus focu
 
 	/* Write query input box. */
 
-	printf(	"<table><tr><td>\n"
-		"<input type=\"text\" name=\"query\" value=\"");
+	printf("<input type=\"text\" name=\"query\" value=\"");
 	if (req->q.query != NULL)
 		html_print(req->q.query);
 	printf( "\" size=\"40\"");
@@ -394,24 +393,16 @@ resp_searchform(const struct req *req, enum focus focu
 		printf(" autofocus");
 	puts(">");
 
-	/* Write submission and reset buttons. */
+	/* Write submission buttons. */
 
-	printf(	"<input type=\"submit\" value=\"Submit\">\n"
-		"<input type=\"reset\" value=\"Reset\">\n");
+	printf(	"<button type=\"submit\" name=\"apropos\" value=\"0\">"
+		"man</button>\n"
+		"<button type=\"submit\" name=\"apropos\" value=\"1\">"
+		"apropos</button>\n<br/>\n");
 
-	/* Write show radio button */
-
-	printf(	"</td><td>\n"
-		"<input type=\"radio\" ");
-	if (req->q.equal)
-		printf("checked=\"checked\" ");
-	printf(	"name=\"apropos\" id=\"show\" value=\"0\">\n"
-		"<label for=\"show\">Show named manual page</label>\n");
-
 	/* Write section selector. */
 
-	puts(	"</td></tr><tr><td>\n"
-		"<select name=\"sec\">");
+	puts("<select name=\"sec\">");
 	for (i = 0; i < sec_MAX; i++) {
 		printf("<option value=\"%s\"", sec_numbers[i]);
 		if (NULL != req->q.sec &&
@@ -454,17 +445,7 @@ resp_searchform(const struct req *req, enum focus focu
 		puts("</select>");
 	}
 
-	/* Write search radio button */
-
-	printf(	"</td><td>\n"
-		"<input type=\"radio\" ");
-	if (0 == req->q.equal)
-		printf("checked=\"checked\" ");
-	printf(	"name=\"apropos\" id=\"search\" value=\"1\">\n"
-		"<label for=\"search\">Search with apropos query</label>\n");
-
-	puts("</td></tr></table>\n"
-	     "</fieldset>\n"
+	puts("</fieldset>\n"
 	     "</form>\n"
 	     "</div>");
 	puts("<!-- End search form. //-->");
@@ -489,9 +470,6 @@ validate_manpath(const struct req *req, const char* ma
 {
 	size_t	 i;
 
-	if ( ! strcmp(manpath, "mandoc"))
-		return 1;
-
 	for (i = 0; i < req->psz; i++)
 		if ( ! strcmp(manpath, req->p[i]))
 			return 1;
@@ -518,9 +496,9 @@ pg_index(const struct req *req)
 	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"
+	       "<a href=\"/%s%sman.cgi.8\">man.cgi(8)</a>\n"
 	       "manual, and the\n"
-	       "<a href=\"/%s%smandoc/man1/apropos.1\">apropos</a>\n"
+	       "<a href=\"/%s%sapropos.1\">apropos(1)</a>\n"
 	       "manual explains the query syntax.\n"
 	       "</p>\n",
 	       scriptname, *scriptname == '\0' ? "" : "/",
@@ -903,13 +881,8 @@ pg_show(struct req *req, const char *fullpath)
 		free(manpath);
 		return;
 	}
+	free(manpath);
 
-	if (strcmp(manpath, "mandoc")) {
-		free(req->q.manpath);
-		req->q.manpath = manpath;
-	} else
-		free(manpath);
-
 	if ( ! validate_filename(file)) {
 		pg_error_badrequest(
 		    "You specified an invalid manual file.");
@@ -1045,7 +1018,7 @@ main(void)
 
 	if (*path != '\0') {
 		parse_path_info(&req, path);
-		if (access(path, F_OK) == -1)
+		if (req.q.manpath == NULL || access(path, F_OK) == -1)
 			path = "";
 	} else if ((querystring = getenv("QUERY_STRING")) != NULL)
 		parse_query_string(&req, querystring);