===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.85
retrieving revision 1.92
diff -u -p -r1.85 -r1.92
--- mandoc/cgi.c	2014/07/25 16:56:06	1.85
+++ mandoc/cgi.c	2014/08/05 15:29:30	1.92
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.85 2014/07/25 16:56:06 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.92 2014/08/05 15:29:30 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -55,13 +56,12 @@ struct	req {
 static	void		 catman(const struct req *, const char *);
 static	void		 format(const struct req *, const char *);
 static	void		 html_print(const char *);
-static	void		 html_printquery(const struct req *);
 static	void		 html_putchar(char);
 static	int 		 http_decode(char *);
 static	void		 http_parse(struct req *, const char *);
 static	void		 http_print(const char *);
 static	void 		 http_putchar(char);
-static	void		 http_printquery(const struct req *);
+static	void		 http_printquery(const struct req *, const char *);
 static	void		 pathgen(struct req *);
 static	void		 pg_error_badrequest(const char *);
 static	void		 pg_error_internal(void);
@@ -145,51 +145,28 @@ html_putchar(char c)
 }
 
 static void
-http_printquery(const struct req *req)
+http_printquery(const struct req *req, const char *sep)
 {
 
-	if (NULL != req->q.manpath) {
-		printf("&manpath=");
-		http_print(req->q.manpath);
-	}
-	if (NULL != req->q.sec) {
-		printf("&sec=");
-		http_print(req->q.sec);
-	}
-	if (NULL != req->q.arch) {
-		printf("&arch=");
-		http_print(req->q.arch);
-	}
 	if (NULL != req->q.query) {
-		printf("&query=");
+		printf("query=");
 		http_print(req->q.query);
 	}
 	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);
-	}
+		printf("%sapropos=1", sep);
 	if (NULL != req->q.sec) {
-		printf("&amp;sec=");
-		html_print(req->q.sec);
+		printf("%ssec=", sep);
+		http_print(req->q.sec);
 	}
 	if (NULL != req->q.arch) {
-		printf("&amp;arch=");
-		html_print(req->q.arch);
+		printf("%sarch=", sep);
+		http_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("%smanpath=", sep);
+		http_print(req->q.manpath);
 	}
-	if (0 == req->q.equal)
-		printf("&amp;apropos=1");
 }
 
 static void
@@ -455,19 +432,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 +454,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 +473,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 +488,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 +546,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);
@@ -638,7 +615,7 @@ pg_searchres(const struct req *req, struct manpage *r,
 		printf("Status: 303 See Other\r\n");
 		printf("Location: http://%s%s/%s/%s?",
 		    HTTP_HOST, scriptname, req->q.manpath, r[0].file);
-		http_printquery(req);
+		http_printquery(req, "&");
 		printf("\r\n"
 		     "Content-Type: text/html; charset=utf-8\r\n"
 		     "\r\n");
@@ -655,7 +632,7 @@ pg_searchres(const struct req *req, struct manpage *r,
 		       "<TD CLASS=\"title\">\n"
 		       "<A HREF=\"%s/%s/%s?", 
 		    scriptname, req->q.manpath, r[i].file);
-		html_printquery(req);
+		http_printquery(req, "&amp;");
 		printf("\">");
 		html_print(r[i].names);
 		printf("</A>\n"
@@ -849,12 +826,13 @@ static void
 format(const struct req *req, const char *file)
 {
 	struct mparse	*mp;
-	int		 fd;
 	struct mdoc	*mdoc;
 	struct man	*man;
 	void		*vp;
+	char		*opts;
 	enum mandoclevel rc;
-	char		 opts[PATH_MAX + 128];
+	int		 fd;
+	int		 usepath;
 
 	if (-1 == (fd = open(file, O_RDONLY, 0))) {
 		puts("<P>You specified an invalid manual file.</P>");
@@ -873,10 +851,14 @@ format(const struct req *req, const char *file)
 		return;
 	}
 
-	snprintf(opts, sizeof(opts), "fragment,man=%s?"
-	    "manpath=%s&amp;query=%%N&amp;sec=%%S&amp;arch=%s",
-	    scriptname, req->q.manpath,
-	    req->q.arch ? req->q.arch : "");
+	usepath = strcmp(req->q.manpath, req->p[0]);
+	mandoc_asprintf(&opts,
+	    "fragment,man=%s?query=%%N&sec=%%S%s%s%s%s",
+	    scriptname,
+	    req->q.arch	? "&arch="       : "",
+	    req->q.arch	? req->q.arch    : "",
+	    usepath	? "&manpath="    : "",
+	    usepath	? req->q.manpath : "");
 
 	mparse_result(mp, &mdoc, &man, NULL);
 	if (NULL == man && NULL == mdoc) {
@@ -896,6 +878,7 @@ format(const struct req *req, const char *file)
 
 	html_free(vp);
 	mparse_free(mp);
+	free(opts);
 }
 
 static void
@@ -1083,7 +1066,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);