===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.68
retrieving revision 1.72
diff -u -p -r1.68 -r1.72
--- mandoc/cgi.c	2014/07/12 23:46:44	1.68
+++ mandoc/cgi.c	2014/07/13 12:55:45	1.72
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.68 2014/07/12 23:46:44 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.72 2014/07/13 12:55:45 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -64,23 +64,24 @@ static	void		 http_print(const char *);
 static	void 		 http_putchar(char);
 static	void		 http_printquery(const struct req *);
 static	void		 pathgen(struct req *);
+static	void		 pg_error_badrequest(const char *);
+static	void		 pg_error_internal(void);
+static	void		 pg_index(const struct req *);
+static	void		 pg_noresult(const struct req *, const char *);
 static	void		 pg_search(const struct req *);
+static	void		 pg_searchres(const struct req *,
+				struct manpage *, size_t);
 static	void		 pg_show(const struct req *, const char *);
 static	void		 resp_begin_html(int, const char *);
 static	void		 resp_begin_http(int, const char *);
 static	void		 resp_end_html(void);
-static	void		 resp_error_badrequest(const char *);
-static	void		 resp_error_internal(void);
-static	void		 resp_index(const struct req *);
-static	void		 resp_noresult(const struct req *,
-				const char *);
-static	void		 resp_search(const struct req *,
-				struct manpage *, size_t);
 static	void		 resp_searchform(const struct req *);
+static	void		 resp_show(const struct req *, const char *);
 
 static	const char	 *scriptname; /* CGI script name */
 static	const char	 *httphost; /* hostname used in the URIs */
 
+static	const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
 static	const char *const sec_numbers[] = {
     "0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9"
 };
@@ -456,24 +457,24 @@ resp_searchform(const struct req *req)
 }
 
 static void
-resp_index(const struct req *req)
+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?query=man.cgi&amp;sec=8\">"
-	       "man.cgi</A> manual, and the "
-	       "<A HREF=\"%s?query=apropos&amp;sec=1\">"
-	       "apropos</A> manual explains the query syntax.\n"
+	       "<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A> "
+	       "manual, and the "
+	       "<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A> "
+	       "manual explains the query syntax.\n"
 	       "</P>\n",
 	       scriptname, scriptname);
 	resp_end_html();
 }
 
 static void
-resp_noresult(const struct req *req, const char *msg)
+pg_noresult(const struct req *req, const char *msg)
 {
 	resp_begin_html(200, NULL);
 	resp_searchform(req);
@@ -484,7 +485,7 @@ resp_noresult(const struct req *req, const char *msg)
 }
 
 static void
-resp_error_badrequest(const char *msg)
+pg_error_badrequest(const char *msg)
 {
 
 	resp_begin_html(400, "Bad Request");
@@ -498,7 +499,7 @@ resp_error_badrequest(const char *msg)
 }
 
 static void
-resp_error_internal(void)
+pg_error_internal(void)
 {
 	resp_begin_html(500, "Internal Server Error");
 	puts("<P>Internal Server Error</P>");
@@ -506,9 +507,11 @@ resp_error_internal(void)
 }
 
 static void
-resp_search(const struct req *req, struct manpage *r, size_t sz)
+pg_searchres(const struct req *req, struct manpage *r, size_t sz)
 {
-	size_t		 i;
+	size_t		 i, iuse, isec;
+	int		 prio, priouse;
+	char		 sec;
 
 	if (1 == sz) {
 		/*
@@ -550,6 +553,30 @@ resp_search(const struct req *req, struct manpage *r, 
 
 	puts("</TABLE>\n"
 	     "</DIV>");
+
+	/*
+	 * In man(1) mode, show one of the pages
+	 * even if more than one is found.
+	 */
+
+	if (req->q.equal) {
+		puts("<HR>");
+		iuse = 0;
+		priouse = 10;
+		for (i = 0; i < sz; i++) {
+			isec = strcspn(r[i].file, "123456789");
+			sec = r[i].file[isec];
+			if ('\0' == sec)
+				continue;
+			prio = sec_prios[sec - '1'];
+			if (prio >= priouse)
+				continue;
+			priouse = prio;
+			iuse = i;
+		}
+		resp_show(req, r[iuse].file);
+	}
+
 	resp_end_html();
 }
 
@@ -563,13 +590,10 @@ catman(const struct req *req, const char *file)
 	int		 italic, bold;
 
 	if (NULL == (f = fopen(file, "r"))) {
-		resp_error_badrequest(
-		    "You specified an invalid manual file.");
+		puts("<P>You specified an invalid manual file.</P>");
 		return;
 	}
 
-	resp_begin_html(200, NULL);
-	resp_searchform(req);
 	puts("<DIV CLASS=\"catman\">\n"
 	     "<PRE>");
 
@@ -683,9 +707,7 @@ catman(const struct req *req, const char *file)
 	}
 
 	puts("</PRE>\n"
-	     "</DIV>\n"
-	     "</BODY>\n"
-	     "</HTML>");
+	     "</DIV>");
 
 	fclose(f);
 }
@@ -702,8 +724,7 @@ format(const struct req *req, const char *file)
 	char		 opts[PATH_MAX + 128];
 
 	if (-1 == (fd = open(file, O_RDONLY, 0))) {
-		resp_error_badrequest(
-		    "You specified an invalid manual file.");
+		puts("<P>You specified an invalid manual file.</P>");
 		return;
 	}
 
@@ -715,7 +736,7 @@ format(const struct req *req, const char *file)
 	if (rc >= MANDOCLEVEL_FATAL) {
 		fprintf(stderr, "fatal mandoc error: %s/%s\n",
 		    req->q.manpath, file);
-		resp_error_internal();
+		pg_error_internal();
 		return;
 	}
 
@@ -727,14 +748,11 @@ format(const struct req *req, const char *file)
 	if (NULL == man && NULL == mdoc) {
 		fprintf(stderr, "fatal mandoc error: %s/%s\n",
 		    req->q.manpath, file);
-		resp_error_internal();
+		pg_error_internal();
 		mparse_free(mp);
 		return;
 	}
 
-	resp_begin_html(200, NULL);
-	resp_searchform(req);
-
 	vp = html_alloc(opts);
 
 	if (NULL != mdoc)
@@ -742,20 +760,29 @@ format(const struct req *req, const char *file)
 	else
 		html_man(vp, man);
 
-	puts("</BODY>\n"
-	     "</HTML>");
-
 	html_free(vp);
 	mparse_free(mp);
 }
 
 static void
+resp_show(const struct req *req, const char *file)
+{
+	if ('.' == file[0] || '/' == file[1])
+		file += 2;
+
+	if ('c' == *file)
+		catman(req, file);
+	else
+		format(req, file);
+}
+
+static void
 pg_show(const struct req *req, const char *path)
 {
 	char		*sub;
 
 	if (NULL == path || NULL == (sub = strchr(path, '/'))) {
-		resp_error_badrequest(
+		pg_error_badrequest(
 		    "You did not specify a page to show.");
 		return;
 	} 
@@ -768,15 +795,15 @@ pg_show(const struct req *req, const char *path)
 	 */
 
 	if (-1 == chdir(path)) {
-		resp_error_badrequest(
+		pg_error_badrequest(
 		    "You specified an invalid manpath.");
 		return;
 	}
 
-	if ('c' == *sub)
-		catman(req, sub);
-	else
-		format(req, sub);
+	resp_begin_html(200, NULL);
+	resp_searchform(req);
+	resp_show(req, sub);
+	resp_end_html();
 }
 
 static void
@@ -797,7 +824,7 @@ pg_search(const struct req *req)
 	 */
 
 	if (-1 == (chdir(req->q.manpath))) {
-		resp_error_badrequest(
+		pg_error_badrequest(
 		    "You specified an invalid manpath.");
 		return;
 	}
@@ -835,11 +862,11 @@ pg_search(const struct req *req)
 	}
 
 	if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz))
-		resp_noresult(req, "You entered an invalid query.");
+		pg_noresult(req, "You entered an invalid query.");
 	else if (0 == ressz)
-		resp_noresult(req, "No results found.");
+		pg_noresult(req, "No results found.");
 	else
-		resp_search(req, res, ressz);
+		pg_searchres(req, res, ressz);
 
 	for (i = 0; i < sz; i++)
 		free(cp[i]);
@@ -881,7 +908,7 @@ main(void)
 	if (-1 == chdir(MAN_DIR)) {
 		fprintf(stderr, "MAN_DIR: %s: %s\n",
 		    MAN_DIR, strerror(errno));
-		resp_error_internal();
+		pg_error_internal();
 		return(EXIT_FAILURE);
 	} 
 
@@ -906,7 +933,7 @@ main(void)
 	else if (NULL != req.q.expr)
 		pg_search(&req);
 	else
-		resp_index(&req);
+		pg_index(&req);
 
 	for (i = 0; i < (int)req.psz; i++)
 		free(req.p[i]);