===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.85
retrieving revision 1.89
diff -u -p -r1.85 -r1.89
--- mandoc/cgi.c	2014/07/25 16:56:06	1.85
+++ mandoc/cgi.c	2014/07/25 19:37:34	1.89
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.85 2014/07/25 16:56:06 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.89 2014/07/25 19:37:34 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -148,10 +148,12 @@ static void
 http_printquery(const struct req *req)
 {
 
-	if (NULL != req->q.manpath) {
-		printf("&manpath=");
-		http_print(req->q.manpath);
+	if (NULL != req->q.query) {
+		printf("query=");
+		http_print(req->q.query);
 	}
+	if (0 == req->q.equal)
+		printf("&apropos=1");
 	if (NULL != req->q.sec) {
 		printf("&sec=");
 		http_print(req->q.sec);
@@ -160,22 +162,23 @@ http_printquery(const struct req *req)
 		printf("&arch=");
 		http_print(req->q.arch);
 	}
-	if (NULL != req->q.query) {
-		printf("&query=");
-		http_print(req->q.query);
+	if (NULL != req->q.manpath &&
+	    strcmp(req->q.manpath, req->p[0])) {
+		printf("&manpath=");
+		http_print(req->q.manpath);
 	}
-	if (0 == req->q.equal)
-		printf("&apropos=1");
 }
 
 static void
 html_printquery(const struct req *req)
 {
 
-	if (NULL != req->q.manpath) {
-		printf("&amp;manpath=");
-		html_print(req->q.manpath);
+	if (NULL != req->q.query) {
+		printf("query=");
+		html_print(req->q.query);
 	}
+	if (0 == req->q.equal)
+		printf("&amp;apropos=1");
 	if (NULL != req->q.sec) {
 		printf("&amp;sec=");
 		html_print(req->q.sec);
@@ -184,12 +187,11 @@ html_printquery(const struct req *req)
 		printf("&amp;arch=");
 		html_print(req->q.arch);
 	}
-	if (NULL != req->q.query) {
-		printf("&amp;query=");
-		html_print(req->q.query);
+	if (NULL != req->q.manpath &&
+	    strcmp(req->q.manpath, req->p[0])) {
+		printf("&amp;manpath=");
+		html_print(req->q.manpath);
 	}
-	if (0 == req->q.equal)
-		printf("&amp;apropos=1");
 }
 
 static void
@@ -455,19 +457,19 @@ resp_searchform(const struct req *req)
 	printf(	"</TD><TD>\n"
 		"<INPUT TYPE=\"radio\" ");
 	if (req->q.equal)
-		printf("CHECKED ");
+		printf("CHECKED=\"checked\" ");
 	printf(	"NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n"
 		"<LABEL FOR=\"show\">Show named manual page</LABEL>\n");
 
 	/* Write section selector. */
 
-	printf(	"</TD></TR><TR><TD>\n"
+	puts(	"</TD></TR><TR><TD>\n"
 		"<SELECT NAME=\"sec\">");
 	for (i = 0; i < sec_MAX; i++) {
 		printf("<OPTION VALUE=\"%s\"", sec_numbers[i]);
 		if (NULL != req->q.sec &&
 		    0 == strcmp(sec_numbers[i], req->q.sec))
-			printf(" SELECTED");
+			printf(" SELECTED=\"selected\"");
 		printf(">%s</OPTION>\n", sec_names[i]);
 	}
 	puts("</SELECT>");
@@ -477,13 +479,13 @@ resp_searchform(const struct req *req)
 	printf(	"<SELECT NAME=\"arch\">\n"
 		"<OPTION VALUE=\"default\"");
 	if (NULL == req->q.arch)
-		printf(" SELECTED");
+		printf(" SELECTED=\"selected\"");
 	puts(">All Architectures</OPTION>");
 	for (i = 0; i < arch_MAX; i++) {
 		printf("<OPTION VALUE=\"%s\"", arch_names[i]);
 		if (NULL != req->q.arch &&
 		    0 == strcmp(arch_names[i], req->q.arch))
-			printf(" SELECTED");
+			printf(" SELECTED=\"selected\"");
 		printf(">%s</OPTION>\n", arch_names[i]);
 	}
 	puts("</SELECT>");
@@ -496,7 +498,7 @@ resp_searchform(const struct req *req)
 			printf("<OPTION ");
 			if (NULL == req->q.manpath ? 0 == i :
 			    0 == strcmp(req->q.manpath, req->p[i]))
-				printf("SELECTED ");
+				printf("SELECTED=\"selected\" ");
 			printf("VALUE=\"");
 			html_print(req->p[i]);
 			printf("\">");
@@ -511,7 +513,7 @@ resp_searchform(const struct req *req)
 	printf(	"</TD><TD>\n"
 		"<INPUT TYPE=\"radio\" ");
 	if (0 == req->q.equal)
-		printf("CHECKED ");
+		printf("CHECKED=\"checked\" ");
 	printf(	"NAME=\"apropos\" ID=\"search\" VALUE=\"1\">\n"
 		"<LABEL FOR=\"search\">Search with apropos query</LABEL>\n");
 
@@ -569,10 +571,10 @@ pg_index(const struct req *req)
 	resp_begin_html(200, NULL);
 	resp_searchform(req);
 	printf("<P>\n"
-	       "This web interface is documented in the "
-	       "<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A> "
-	       "manual, and the "
-	       "<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A> "
+	       "This web interface is documented in the\n"
+	       "<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A>\n"
+	       "manual, and the\n"
+	       "<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A>\n"
 	       "manual explains the query syntax.\n"
 	       "</P>\n",
 	       scriptname, scriptname);
@@ -874,8 +876,9 @@ format(const struct req *req, const char *file)
 	}
 
 	snprintf(opts, sizeof(opts), "fragment,man=%s?"
-	    "manpath=%s&amp;query=%%N&amp;sec=%%S&amp;arch=%s",
+	    "manpath=%s&query=%%N&sec=%%S%s%s",
 	    scriptname, req->q.manpath,
+	    req->q.arch ? "&arch=" : "",
 	    req->q.arch ? req->q.arch : "");
 
 	mparse_result(mp, &mdoc, &man, NULL);
@@ -1083,7 +1086,8 @@ main(void)
 	if (NULL != (querystring = getenv("QUERY_STRING")))
 		http_parse(&req, querystring);
 
-	if ( ! validate_manpath(&req, req.q.manpath)) {
+	if ( ! (NULL == req.q.manpath ||
+	    validate_manpath(&req, req.q.manpath))) {
 		pg_error_badrequest(
 		    "You specified an invalid manpath.");
 		return(EXIT_FAILURE);