===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.64
retrieving revision 1.66
diff -u -p -r1.64 -r1.66
--- mandoc/cgi.c	2014/07/12 01:55:30	1.64
+++ mandoc/cgi.c	2014/07/12 17:21:45	1.66
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.64 2014/07/12 01:55:30 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.66 2014/07/12 17:21:45 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -34,13 +34,6 @@
 #include "manpath.h"
 #include "mansearch.h"
 
-enum	page {
-	PAGE_INDEX,
-	PAGE_SEARCH,
-	PAGE_SHOW,
-	PAGE__MAX
-};
-
 /*
  * A query as passed to the search function.
  */
@@ -49,14 +42,13 @@ struct	query {
 	const char	*arch; /* architecture */
 	const char	*sec; /* manual section */
 	const char	*expr; /* unparsed expression string */
-	int		 legacy; /* whether legacy mode */
+	int		 equal; /* match whole names, not substrings */
 };
 
 struct	req {
 	struct query	  q;
 	char		**p; /* array of available manpaths */
 	size_t		  psz; /* number of available manpaths */
-	enum page	  page;
 };
 
 static	void		 catman(const struct req *, const char *);
@@ -71,15 +63,13 @@ 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_index(const struct req *, char *);
-static	void		 pg_search(const struct req *, char *);
-static	void		 pg_show(const struct req *, char *);
+static	void		 pg_search(const struct req *);
+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_error_notfound(const char *);
 static	void		 resp_index(const struct req *);
 static	void		 resp_noresult(const struct req *,
 				const char *);
@@ -92,12 +82,6 @@ static	const char	 *mandir; /* contains all manpath di
 static	const char	 *cssdir; /* css directory */
 static	const char	 *httphost; /* hostname used in the URIs */
 
-static	const char * const pages[PAGE__MAX] = {
-	"index", /* PAGE_INDEX */ 
-	"search", /* PAGE_SEARCH */
-	"show", /* PAGE_SHOW */
-};
-
 /*
  * Print a character, escaping HTML along the way.
  * This will pass non-ASCII straight to output: be warned!
@@ -142,9 +126,11 @@ http_printquery(const struct req *req)
 		http_print(req->q.arch);
 	}
 	if (NULL != req->q.expr) {
-		printf("&expr=");
-		http_print(req->q.expr ? req->q.expr : "");
+		printf("&query=");
+		http_print(req->q.expr);
 	}
+	if (0 == req->q.equal)
+		printf("&apropos=1");
 }
 
 static void
@@ -164,9 +150,11 @@ html_printquery(const struct req *req)
 		html_print(req->q.arch);
 	}
 	if (NULL != req->q.expr) {
-		printf("&amp;expr=");
+		printf("&amp;query=");
 		html_print(req->q.expr);
 	}
+	if (0 == req->q.equal)
+		printf("&amp;apropos=1");
 }
 
 static void
@@ -202,12 +190,11 @@ static void
 http_parse(struct req *req, char *p)
 {
 	char            *key, *val;
-	int		 legacy;
 
 	memset(&req->q, 0, sizeof(struct query));
 	req->q.manpath = req->p[0];
+	req->q.equal = 1;
 
-	legacy = -1;
 	while ('\0' != *p) {
 		key = p;
 		val = NULL;
@@ -228,37 +215,21 @@ http_parse(struct req *req, char *p)
 		if (NULL != val && ! http_decode(val))
 			break;
 
-		if (0 == strcmp(key, "expr"))
+		if (0 == strcmp(key, "query"))
 			req->q.expr = val;
-		else if (0 == strcmp(key, "query"))
-			req->q.expr = val;
-		else if (0 == strcmp(key, "sec"))
-			req->q.sec = val;
-		else if (0 == strcmp(key, "sektion"))
-			req->q.sec = val;
-		else if (0 == strcmp(key, "arch"))
-			req->q.arch = val;
 		else if (0 == strcmp(key, "manpath"))
 			req->q.manpath = val;
 		else if (0 == strcmp(key, "apropos"))
-			legacy = 0 == strcmp(val, "0");
+			req->q.equal = !strcmp(val, "0");
+		else if (0 == strcmp(key, "sec") ||
+			 0 == strcmp(key, "sektion")) {
+			if (strcmp(val, "0"))
+				req->q.sec = val;
+		} else if (0 == strcmp(key, "arch")) {
+			if (strcmp(val, "default"))
+				req->q.arch = val;
+		}
 	}
-
-	/* Test for old man.cgi compatibility mode. */
-
-	req->q.legacy = legacy > 0;
-
-	/* 
-	 * Section "0" means no section when in legacy mode.
-	 * For some man.cgi scripts, "default" arch is none.
-	 */
-
-	if (req->q.legacy && NULL != req->q.sec)
-		if (0 == strcmp(req->q.sec, "0"))
-			req->q.sec = NULL;
-	if (req->q.legacy && NULL != req->q.arch)
-		if (0 == strcmp(req->q.arch, "default"))
-			req->q.arch = NULL;
 }
 
 static void
@@ -365,13 +336,23 @@ resp_searchform(const struct req *req)
 
 	puts("<!-- Begin search form. //-->");
 	printf("<DIV ID=\"mancgi\">\n"
-	       "<FORM ACTION=\"%s/search\" METHOD=\"get\">\n"
+	       "<FORM ACTION=\"%s\" METHOD=\"get\">\n"
 	       "<FIELDSET>\n"
 	       "<LEGEND>Search Parameters</LEGEND>\n"
-	       "<INPUT TYPE=\"submit\" "
-	       " VALUE=\"Search\"> for manuals matching \n"
-	       "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"",
+	       "<INPUT TYPE=\"submit\" VALUE=\"Search\"> "
+	       "for manuals \n",
 	       scriptname);
+	printf("<SELECT NAME=\"apropos\">\n"
+	       "<OPTION VALUE=\"0\"");
+	if (req->q.equal)
+		printf(" SELECTED=\"selected\"");
+	printf(">named</OPTION>\n"
+	       "<OPTION VALUE=\"1\"");
+	if (0 == req->q.equal)
+		printf(" SELECTED=\"selected\"");
+	printf(">matching</OPTION>\n"
+	       "</SELECT>\n"
+	       "<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\"");
 	html_print(req->q.expr ? req->q.expr : "");
 	printf("\">, section "
 	       "<INPUT TYPE=\"text\""
@@ -417,9 +398,9 @@ resp_index(const struct req *req)
 	resp_searchform(req);
 	printf("<P>\n"
 	       "This web interface is documented in the "
-	       "<A HREF=\"%s/search?expr=Nm~^man\\.cgi$&amp;sec=8\">"
+	       "<A HREF=\"%s?query=man.cgi&amp;sec=8\">"
 	       "man.cgi</A> manual, and the "
-	       "<A HREF=\"%s/search?expr=Nm~^apropos$&amp;sec=1\">"
+	       "<A HREF=\"%s?query=apropos&amp;sec=1\">"
 	       "apropos</A> manual explains the query syntax.\n"
 	       "</P>\n",
 	       scriptname, scriptname);
@@ -452,24 +433,6 @@ resp_error_badrequest(const char *msg)
 }
 
 static void
-resp_error_notfound(const char *page)
-{
-
-	resp_begin_html(404, "Not Found");
-	puts("<H1>Page Not Found</H1>\n"
-	     "<P>\n"
-	     "The page you're looking for, ");
-	printf("<B>");
-	html_print(page);
-	printf("</B>,\n"
-	       "could not be found.\n"
-	       "Try searching from the\n"
-	       "<A HREF=\"%s\">main page</A>.\n"
-	       "</P>", scriptname);
-	resp_end_html();
-}
-
-static void
 resp_error_internal(void)
 {
 	resp_begin_html(500, "Internal Server Error");
@@ -488,7 +451,7 @@ resp_search(const struct req *req, struct manpage *r, 
 		 * without any delay.
 		 */
 		printf("Status: 303 See Other\r\n");
-		printf("Location: http://%s%s/show/%s/%s?",
+		printf("Location: http://%s%s/%s/%s?",
 		    httphost, scriptname, req->q.manpath, r[0].file);
 		http_printquery(req);
 		printf("\r\n"
@@ -507,7 +470,7 @@ resp_search(const struct req *req, struct manpage *r, 
 	for (i = 0; i < sz; i++) {
 		printf("<TR>\n"
 		       "<TD CLASS=\"title\">\n"
-		       "<A HREF=\"%s/show/%s/%s?", 
+		       "<A HREF=\"%s/%s/%s?", 
 		    scriptname, req->q.manpath, r[i].file);
 		html_printquery(req);
 		printf("\">");
@@ -525,15 +488,7 @@ resp_search(const struct req *req, struct manpage *r, 
 	resp_end_html();
 }
 
-/* ARGSUSED */
 static void
-pg_index(const struct req *req, char *path)
-{
-
-	resp_index(req);
-}
-
-static void
 catman(const struct req *req, const char *file)
 {
 	FILE		*f;
@@ -700,7 +655,7 @@ format(const struct req *req, const char *file)
 	}
 
 	snprintf(opts, sizeof(opts),
-	    "fragment,man=%s/search?sec=%%S&expr=Nm~^%%N$",
+	    "fragment,man=%s?query=%%N&amp;sec=%%S",
 	    scriptname);
 
 	mparse_result(mp, &mdoc, &man, NULL);
@@ -730,7 +685,7 @@ format(const struct req *req, const char *file)
 }
 
 static void
-pg_show(const struct req *req, char *path)
+pg_show(const struct req *req, const char *path)
 {
 	char		*sub;
 
@@ -760,7 +715,7 @@ pg_show(const struct req *req, char *path)
 }
 
 static void
-pg_search(const struct req *req, char *path)
+pg_search(const struct req *req)
 {
 	struct mansearch	  search;
 	struct manpaths		  paths;
@@ -784,8 +739,8 @@ pg_search(const struct req *req, char *path)
 
 	search.arch = req->q.arch;
 	search.sec = req->q.sec;
-	search.deftype = TYPE_Nm | TYPE_Nd;
-	search.flags = 0;
+	search.deftype = req->q.equal ? TYPE_Nm : (TYPE_Nm | TYPE_Nd);
+	search.flags = req->q.equal ? MANSEARCH_MAN : 0;
 
 	paths.sz = 1;
 	paths.paths = mandoc_malloc(sizeof(char *));
@@ -839,9 +794,10 @@ pg_search(const struct req *req, char *path)
 int
 main(void)
 {
-	int		 i;
 	struct req	 req;
-	char		*querystring, *path, *subpath;
+	const char	*path;
+	char		*querystring;
+	int		 i;
 
 	/* Scan our run-time environment. */
 
@@ -878,52 +834,20 @@ main(void)
 	if (NULL != (querystring = getenv("QUERY_STRING")))
 		http_parse(&req, querystring);
 
-	/*
-	 * Now juggle paths to extract information.
-	 * We want to extract our filetype (the file suffix), the
-	 * initial path component, then the trailing component(s).
-	 * Start with leading subpath component. 
-	 */
+	/* Dispatch to the three different pages. */
 
-	subpath = path = NULL;
-	req.page = PAGE__MAX;
+	path = getenv("PATH_INFO");
+	if (NULL == path)
+		path = "";
+	else if ('/' == *path)
+		path++;
 
-	if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path)
-		req.page = PAGE_INDEX;
-
-	if (NULL != path && '/' == *path && '\0' == *++path)
-		req.page = PAGE_INDEX;
-
-	/* Resolve subpath component. */
-
-	if (NULL != path && NULL != (subpath = strchr(path, '/')))
-		*subpath++ = '\0';
-
-	/* Map path into one we recognise. */
-
-	if (NULL != path && '\0' != *path)
-		for (i = 0; i < (int)PAGE__MAX; i++) 
-			if (0 == strcmp(pages[i], path)) {
-				req.page = (enum page)i;
-				break;
-			}
-
-	/* Route pages. */
-
-	switch (req.page) {
-	case (PAGE_INDEX):
-		pg_index(&req, subpath);
-		break;
-	case (PAGE_SEARCH):
-		pg_search(&req, subpath);
-		break;
-	case (PAGE_SHOW):
-		pg_show(&req, subpath);
-		break;
-	default:
-		resp_error_notfound(path);
-		break;
-	}
+	if ('\0' != *path)
+		pg_show(&req, path);
+	else if (NULL != req.q.expr)
+		pg_search(&req);
+	else
+		resp_index(&req);
 
 	for (i = 0; i < (int)req.psz; i++)
 		free(req.p[i]);