===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.120
retrieving revision 1.125
diff -u -p -r1.120 -r1.125
--- mandoc/cgi.c	2016/04/13 15:38:45	1.120
+++ mandoc/cgi.c	2016/04/15 00:51:59	1.125
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.120 2016/04/13 15:38:45 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.125 2016/04/15 00:51:59 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
@@ -55,6 +55,7 @@ struct	req {
 	struct query	  q;
 	char		**p; /* array of available manpaths */
 	size_t		  psz; /* number of available manpaths */
+	int		  isquery; /* QUERY_STRING used, not PATH_INFO */
 };
 
 static	void		 catman(const struct req *, const char *);
@@ -107,16 +108,16 @@ static	const int sec_MAX = sizeof(sec_names) / sizeof(
 
 static	const char *const arch_names[] = {
     "amd64",       "alpha",       "armish",      "armv7",
-    "aviion",      "hppa",        "hppa64",      "i386",
-    "ia64",        "landisk",     "loongson",    "luna88k",
-    "macppc",      "mips64",      "octeon",      "sgi",
-    "socppc",      "solbourne",   "sparc",       "sparc64",
-    "vax",         "zaurus",
+    "hppa",        "hppa64",      "i386",        "landisk",
+    "loongson",    "luna88k",     "macppc",      "mips64",
+    "octeon",      "sgi",         "socppc",      "sparc",
+    "sparc64",     "zaurus",
     "amiga",       "arc",         "arm32",       "atari",
-    "beagle",      "cats",        "hp300",       "mac68k",
-    "mvme68k",     "mvme88k",     "mvmeppc",     "palm",
-    "pc532",       "pegasos",     "pmax",        "powerpc",
-    "sun3",        "wgrisc",      "x68k"
+    "aviion",      "beagle",      "cats",        "hp300",       
+    "ia64",        "mac68k",      "mvme68k",     "mvme88k",
+    "mvmeppc",     "palm",        "pc532",       "pegasos",
+    "pmax",        "powerpc",     "solbourne",   "sun3",
+    "vax",         "wgrisc",      "x68k"
 };
 static	const int arch_MAX = sizeof(arch_names) / sizeof(char *);
 
@@ -188,6 +189,7 @@ http_parse(struct req *req, const char *qs)
 	char		*key, *val;
 	size_t		 keysz, valsz;
 
+	req->isquery	= 1;
 	req->q.manpath	= NULL;
 	req->q.arch	= NULL;
 	req->q.sec	= NULL;
@@ -568,7 +570,7 @@ pg_searchres(const struct req *req, struct manpage *r,
 		return;
 	}
 
-	if (1 == sz) {
+	if (req->isquery && sz == 1) {
 		/*
 		 * If we have just one result, then jump there now
 		 * without any delay.
@@ -586,34 +588,37 @@ pg_searchres(const struct req *req, struct manpage *r,
 
 	resp_begin_html(200, NULL);
 	resp_searchform(req);
-	puts("<DIV CLASS=\"results\">");
-	puts("<TABLE>");
 
-	for (i = 0; i < sz; i++) {
-		printf("<TR>\n"
-		       "<TD CLASS=\"title\">\n"
-		       "<A HREF=\"/%s%s%s/%s",
-		    scriptname, *scriptname == '\0' ? "" : "/",
-		    req->q.manpath, r[i].file);
-		printf("\">");
-		html_print(r[i].names);
-		printf("</A>\n"
-		       "</TD>\n"
-		       "<TD CLASS=\"desc\">");
-		html_print(r[i].output);
-		puts("</TD>\n"
-		     "</TR>");
-	}
+	if (sz > 1) {
+		puts("<DIV CLASS=\"results\">");
+		puts("<TABLE>");
 
-	puts("</TABLE>\n"
-	     "</DIV>");
+		for (i = 0; i < sz; i++) {
+			printf("<TR>\n"
+			       "<TD CLASS=\"title\">\n"
+			       "<A HREF=\"/%s%s%s/%s",
+			    scriptname, *scriptname == '\0' ? "" : "/",
+			    req->q.manpath, r[i].file);
+			printf("\">");
+			html_print(r[i].names);
+			printf("</A>\n"
+			       "</TD>\n"
+			       "<TD CLASS=\"desc\">");
+			html_print(r[i].output);
+			puts("</TD>\n"
+			     "</TR>");
+		}
 
+		puts("</TABLE>\n"
+		     "</DIV>");
+	}
+
 	/*
 	 * In man(1) mode, show one of the pages
 	 * even if more than one is found.
 	 */
 
-	if (req->q.equal) {
+	if (req->q.equal || sz == 1) {
 		puts("<HR>");
 		iuse = 0;
 		priouse = 20;
@@ -814,12 +819,8 @@ format(const struct req *req, const char *file)
 	memset(&conf, 0, sizeof(conf));
 	conf.fragment = 1;
 	usepath = strcmp(req->q.manpath, req->p[0]);
-	mandoc_asprintf(&conf.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 : "");
+	mandoc_asprintf(&conf.man, "/%s%s%%N.%%S",
+	    usepath ? req->q.manpath : "", usepath ? "/" : "");
 
 	mparse_result(mp, &man, NULL);
 	if (man == NULL) {
@@ -1036,9 +1037,10 @@ main(void)
 	else if (*path == '/')
 		path++;
 
-	if (*path != '\0' && access(path, F_OK) == -1) {
+	if (*path != '\0') {
 		path_parse(&req, path);
-		path = "";
+		if (access(path, F_OK) == -1)
+			path = "";
 	} else if ((querystring = getenv("QUERY_STRING")) != NULL)
 		http_parse(&req, querystring);
 
@@ -1085,6 +1087,7 @@ path_parse(struct req *req, const char *path)
 {
 	int	 dir_done;
 
+	req->isquery = 0;
 	req->q.equal = 1;
 	req->q.manpath = mandoc_strdup(path);