===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.9
retrieving revision 1.58
diff -u -p -r1.9 -r1.58
--- mandoc/cgi.c	2011/12/04 22:52:50	1.9
+++ mandoc/cgi.c	2014/07/09 14:18:59	1.58
@@ -1,6 +1,7 @@
-/*	$Id: cgi.c,v 1.9 2011/12/04 22:52:50 kristaps Exp $ */
+/*	$Id: cgi.c,v 1.58 2014/07/09 14:18:59 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,35 +19,21 @@
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/wait.h>
-
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <regex.h>
 #include <stdio.h>
-#include <stdarg.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "apropos_db.h"
 #include "mandoc.h"
-#include "mdoc.h"
-#include "man.h"
+#include "mandoc_aux.h"
 #include "main.h"
 #include "manpath.h"
+#include "mansearch.h"
 
-#ifdef __linux__
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
 enum	page {
 	PAGE_INDEX,
 	PAGE_SEARCH,
@@ -54,45 +41,55 @@ enum	page {
 	PAGE__MAX
 };
 
-struct	kval {
-	char		*key;
-	char		*val;
+/*
+ * A query as passed to the search function.
+ */
+struct	query {
+	const char	*manpath; /* desired manual directory */
+	const char	*arch; /* architecture */
+	const char	*sec; /* manual section */
+	const char	*expr; /* unparsed expression string */
+	int		 legacy; /* whether legacy mode */
 };
 
 struct	req {
-	struct kval	*fields;
-	size_t		 fieldsz;
-	enum page	 page;
+	struct query	  q;
+	char		**p; /* array of available manpaths */
+	size_t		  psz; /* number of available manpaths */
+	enum page	  page;
 };
 
-static	int		 atou(const char *, unsigned *);
-static	void		 catman(const char *);
-static	void		 format(const char *);
+static	void		 catman(const struct req *, const char *);
+static	int	 	 cmp(const void *, const void *);
+static	void		 format(const struct req *, const char *);
 static	void		 html_print(const char *);
-static	int 		 kval_decode(char *);
-static	void		 kval_parse(struct kval **, size_t *, char *);
-static	void		 kval_free(struct kval *, size_t);
-static	void		 pg_index(const struct manpaths *,
-				const struct req *, char *);
-static	void		 pg_search(const struct manpaths *,
-				const struct req *, char *);
-static	void		 pg_show(const struct manpaths *,
-				const struct req *, char *);
+static	void		 html_printquery(const struct req *);
+static	void		 html_putchar(char);
+static	int 		 http_decode(char *);
+static	void		 http_parse(struct req *, char *);
+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		 resp_bad(void);
 static	void		 resp_baddb(void);
-static	void		 resp_badexpr(const struct req *);
-static	void		 resp_badmanual(void);
-static	void		 resp_badpage(void);
+static	void		 resp_error400(void);
+static	void		 resp_error404(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_index(const struct req *);
-static	void		 resp_search(struct res *, size_t, void *);
+static	void		 resp_search(const struct req *,
+				struct manpage *, size_t);
 static	void		 resp_searchform(const struct req *);
 
-static	const char	 *progname;
-static	const char	 *cache;
-static	const char	 *host;
+static	const char	 *scriptname; /* CGI script name */
+static	const char	 *mandir; /* contains all manpath directories */
+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 */ 
@@ -101,133 +98,180 @@ static	const char * const pages[PAGE__MAX] = {
 };
 
 /*
- * This is just OpenBSD's strtol(3) suggestion.
- * I use it instead of strtonum(3) for portability's sake.
+ * Print a character, escaping HTML along the way.
+ * This will pass non-ASCII straight to output: be warned!
  */
-static int
-atou(const char *buf, unsigned *v)
+static void
+html_putchar(char c)
 {
-	char		*ep;
-	long		 lval;
 
-	errno = 0;
-	lval = strtol(buf, &ep, 10);
-	if (buf[0] == '\0' || *ep != '\0')
-		return(0);
-	if ((errno == ERANGE && (lval == LONG_MAX || 
-					lval == LONG_MIN)) ||
-			(lval > UINT_MAX || lval < 0))
-		return(0);
+	switch (c) {
+	case ('"'):
+		printf("&quote;");
+		break;
+	case ('&'):
+		printf("&amp;");
+		break;
+	case ('>'):
+		printf("&gt;");
+		break;
+	case ('<'):
+		printf("&lt;");
+		break;
+	default:
+		putchar((unsigned char)c);
+		break;
+	}
+}
 
-	*v = (unsigned int)lval;
-	return(1);
+static void
+http_printquery(const struct req *req)
+{
+
+	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.expr) {
+		printf("&expr=");
+		http_print(req->q.expr ? req->q.expr : "");
+	}
 }
 
+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.sec) {
+		printf("&amp;sec=");
+		html_print(req->q.sec);
+	}
+	if (NULL != req->q.arch) {
+		printf("&amp;arch=");
+		html_print(req->q.arch);
+	}
+	if (NULL != req->q.expr) {
+		printf("&amp;expr=");
+		html_print(req->q.expr ? req->q.expr : "");
+	}
+}
+
+static void
+http_print(const char *p)
+{
+
+	if (NULL == p)
+		return;
+	while ('\0' != *p)
+		http_putchar(*p++);
+}
+
 /*
- * Print a word, escaping HTML along the way.
- * This will pass non-ASCII straight to output: be warned!
+ * Call through to html_putchar().
+ * Accepts NULL strings.
  */
 static void
 html_print(const char *p)
 {
-	char		 c;
 	
 	if (NULL == p)
 		return;
-
 	while ('\0' != *p)
-		switch ((c = *p++)) {
-		case ('"'):
-			printf("&quote;");
-			break;
-		case ('&'):
-			printf("&amp;");
-			break;
-		case ('>'):
-			printf("&gt;");
-			break;
-		case ('<'):
-			printf("&lt;");
-			break;
-		default:
-			putchar((unsigned char)c);
-			break;
-		}
+		html_putchar(*p++);
 }
 
-static void
-kval_free(struct kval *p, size_t sz)
-{
-	int		 i;
-
-	for (i = 0; i < (int)sz; i++) {
-		free(p[i].key);
-		free(p[i].val);
-	}
-	free(p);
-}
-
 /*
  * Parse out key-value pairs from an HTTP request variable.
  * This can be either a cookie or a POST/GET string, although man.cgi
  * uses only GET for simplicity.
  */
 static void
-kval_parse(struct kval **kv, size_t *kvsz, char *p)
+http_parse(struct req *req, char *p)
 {
 	char            *key, *val;
-	size_t           sz, cur;
+	int		 legacy;
 
-	cur = 0;
+	memset(&req->q, 0, sizeof(struct query));
+	req->q.manpath = req->p[0];
 
-	while (p && '\0' != *p) {
-		while (' ' == *p)
-			p++;
-
+	legacy = -1;
+	while ('\0' != *p) {
 		key = p;
 		val = NULL;
 
-		if (NULL != (p = strchr(p, '='))) {
+		p += (int)strcspn(p, ";&");
+		if ('\0' != *p)
 			*p++ = '\0';
-			val = p;
+		if (NULL != (val = strchr(key, '=')))
+			*val++ = '\0';
 
-			sz = strcspn(p, ";&");
-			/* LINTED */
-			p += sz;
+		if ('\0' == *key || NULL == val || '\0' == *val)
+			continue;
 
-			if ('\0' != *p)
-				*p++ = '\0';
-		} else {
-			p = key;
-			sz = strcspn(p, ";&");
-			/* LINTED */
-			p += sz;
+		/* Just abort handling. */
 
-			if ('\0' != *p)
-				p++;
-			continue;
-		}
+		if ( ! http_decode(key))
+			break;
+		if (NULL != val && ! http_decode(val))
+			break;
 
-		if ('\0' == *key || '\0' == *val)
-			continue;
+		if (0 == strcmp(key, "expr"))
+			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");
+	}
 
-		/* Just abort handling. */
+	/* Test for old man.cgi compatibility mode. */
 
-		if ( ! kval_decode(key))
-			return;
-		if ( ! kval_decode(val))
-			return;
+	req->q.legacy = legacy > 0;
 
-		if (*kvsz + 1 >= cur) {
-			cur++;
-			*kv = mandoc_realloc
-				(*kv, cur * sizeof(struct kval));
-		}
+	/* 
+	 * Section "0" means no section when in legacy mode.
+	 * For some man.cgi scripts, "default" arch is none.
+	 */
 
-		(*kv)[(int)*kvsz].key = mandoc_strdup(key);
-		(*kv)[(int)*kvsz].val = mandoc_strdup(val);
-		(*kvsz)++;
+	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
+http_putchar(char c)
+{
+
+	if (isalnum((unsigned char)c)) {
+		putchar((unsigned char)c);
+		return;
+	} else if (' ' == c) {
+		putchar('+');
+		return;
 	}
+	printf("%%%.2x", c);
 }
 
 /*
@@ -236,7 +280,7 @@ kval_parse(struct kval **kv, size_t *kvsz, char *p)
  * over the allocated string.
  */
 static int
-kval_decode(char *p)
+http_decode(char *p)
 {
 	char             hex[3];
 	int              c;
@@ -271,9 +315,9 @@ resp_begin_http(int code, const char *msg)
 	if (200 != code)
 		printf("Status: %d %s\n", code, msg);
 
-	puts("Content-Type: text/html; charset=utf-8"		"\n"
-	     "Cache-Control: no-cache"				"\n"
-	     "Pragma: no-cache"					"\n"
+	puts("Content-Type: text/html; charset=utf-8\n"
+	     "Cache-Control: no-cache\n"
+	     "Pragma: no-cache\n"
 	     "");
 
 	fflush(stdout);
@@ -285,59 +329,77 @@ resp_begin_html(int code, const char *msg)
 
 	resp_begin_http(code, msg);
 
-	puts("<!DOCTYPE HTML PUBLIC "				"\n"
-	     " \"-//W3C//DTD HTML 4.01//EN\""			"\n"
-	     " \"http://www.w3.org/TR/html4/strict.dtd\">"	"\n"
-	     "<HTML>"						"\n"
-	     " <HEAD>"						"\n"
-	     "  <TITLE>System Manpage Reference</TITLE>"	"\n"
-	     " </HEAD>"						"\n"
-	     " <BODY>"						"\n"
-	     "<!-- Begin page content. //-->");
+	printf("<!DOCTYPE HTML PUBLIC "
+	       " \"-//W3C//DTD HTML 4.01//EN\""
+	       " \"http://www.w3.org/TR/html4/strict.dtd\">\n"
+	       "<HTML>\n"
+	       "<HEAD>\n"
+	       "<META HTTP-EQUIV=\"Content-Type\""
+	       " CONTENT=\"text/html; charset=utf-8\">\n"
+	       "<LINK REL=\"stylesheet\" HREF=\"%s/man-cgi.css\""
+	       " TYPE=\"text/css\" media=\"all\">\n"
+	       "<LINK REL=\"stylesheet\" HREF=\"%s/man.css\""
+	       " TYPE=\"text/css\" media=\"all\">\n"
+	       "<TITLE>System Manpage Reference</TITLE>\n"
+	       "</HEAD>\n"
+	       "<BODY>\n"
+	       "<!-- Begin page content. //-->\n",
+	       cssdir, cssdir);
 }
 
 static void
 resp_end_html(void)
 {
 
-	puts(" </BODY>\n</HTML>");
+	puts("</BODY>\n"
+	     "</HTML>");
 }
 
 static void
 resp_searchform(const struct req *req)
 {
-	int	 	 i;
-	const char	*expr, *sec, *arch;
+	int		 i;
 
-	expr = sec = arch = "";
-
-	for (i = 0; i < (int)req->fieldsz; i++)
-		if (0 == strcmp(req->fields[i].key, "expr"))
-			expr = req->fields[i].val;
-		else if (0 == strcmp(req->fields[i].key, "sec"))
-			sec = req->fields[i].val;
-		else if (0 == strcmp(req->fields[i].key, "arch"))
-			arch = req->fields[i].val;
-
 	puts("<!-- Begin search form. //-->");
-	printf("<FORM ACTION=\"");
-	html_print(progname);
-	printf("/search.html\" METHOD=\"get\">\n");
-	puts(" <FIELDSET>"					"\n"
-	     "  <INPUT TYPE=\"submit\" VALUE=\"Search:\">");
-	printf("  Terms: <INPUT TYPE=\"text\" "
-			"SIZE=\"60\" NAME=\"expr\" VALUE=\"");
-	html_print(expr);
-	puts("\">");
-	printf("  Section: <INPUT TYPE=\"text\" "
-			"SIZE=\"4\" NAME=\"sec\" VALUE=\"");
-	html_print(sec);
-	puts("\">");
-	printf("  Arch: <INPUT TYPE=\"text\" "
-			"SIZE=\"8\" NAME=\"arch\" VALUE=\"");
-	html_print(arch);
-	puts("\">");
-	puts(" </FIELDSET>\n</FORM>\n<!-- End search form. //-->");
+	printf("<DIV ID=\"mancgi\">\n"
+	       "<FORM ACTION=\"%s/search\" METHOD=\"get\">\n"
+	       "<FIELDSET>\n"
+	       "<LEGEND>Search Parameters</LEGEND>\n"
+	       "<INPUT TYPE=\"submit\" "
+	       " VALUE=\"Search\"> for manuals satisfying \n"
+	       "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"",
+	       scriptname);
+	html_print(req->q.expr ? req->q.expr : "");
+	printf("\">, section "
+	       "<INPUT TYPE=\"text\""
+	       " SIZE=\"4\" NAME=\"sec\" VALUE=\"");
+	html_print(req->q.sec ? req->q.sec : "");
+	printf("\">, arch "
+	       "<INPUT TYPE=\"text\""
+	       " SIZE=\"8\" NAME=\"arch\" VALUE=\"");
+	html_print(req->q.arch ? req->q.arch : "");
+	printf("\">");
+	if (req->psz > 1) {
+		puts(", <SELECT NAME=\"manpath\">");
+		for (i = 0; i < (int)req->psz; i++) {
+			printf("<OPTION ");
+			if (NULL == req->q.manpath ? 0 == i :
+			    0 == strcmp(req->q.manpath, req->p[i]))
+				printf("SELECTED=\"selected\" ");
+			printf("VALUE=\"");
+			html_print(req->p[i]);
+			printf("\">");
+			html_print(req->p[i]);
+			puts("</OPTION>");
+		}
+		puts("</SELECT>");
+	}
+	puts(".\n"
+	     "<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n"
+	     "</FIELDSET>\n"
+	     "</FORM>\n"
+	     "</DIV>");
+	puts("<!-- End search form. //-->");
 }
 
 static void
@@ -350,38 +412,42 @@ resp_index(const struct req *req)
 }
 
 static void
-resp_badpage(void)
+resp_error400(void)
 {
 
-	resp_begin_html(404, "Not Found");
-	puts("<P>Page not found.</P>");
+	resp_begin_html(400, "Query Malformed");
+	printf("<H1>Malformed Query</H1>\n"
+	       "<P>\n"
+	       "The query your entered was malformed.\n"
+	       "Try again from the\n"
+	       "<A HREF=\"%s/index.html\">main page</A>.\n"
+	       "</P>", scriptname);
 	resp_end_html();
 }
 
 static void
-resp_badmanual(void)
+resp_error404(const char *page)
 {
 
 	resp_begin_html(404, "Not Found");
-	puts("<P>Requested manual not found.</P>");
+	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_badexpr(const struct req *req)
-{
-
-	resp_begin_html(200, NULL);
-	resp_searchform(req);
-	puts("<P>Your search didn't work.</P>");
-	resp_end_html();
-}
-
-static void
 resp_bad(void)
 {
 	resp_begin_html(500, "Internal Server Error");
-	puts("<P>Generic badness happened.</P>");
+	puts("<P>Internal Server Error</P>");
 	resp_end_html();
 }
 
@@ -395,9 +461,9 @@ resp_baddb(void)
 }
 
 static void
-resp_search(struct res *r, size_t sz, void *arg)
+resp_search(const struct req *req, struct manpage *r, size_t sz)
 {
-	int		 i;
+	size_t		 i;
 
 	if (1 == sz) {
 		/*
@@ -405,71 +471,199 @@ resp_search(struct res *r, size_t sz, void *arg)
 		 * without any delay.
 		 */
 		puts("Status: 303 See Other");
-		printf("Location: http://%s%s/show/%u/%u.html\n",
-				host, progname,
-				r[0].volume, r[0].rec);
-		puts("Content-Type: text/html; charset=utf-8\n");
+		printf("Location: http://%s%s/show/%s/%s?",
+		    httphost, scriptname, req->q.manpath, r[0].file);
+		http_printquery(req);
+		puts("\n"
+		     "Content-Type: text/html; charset=utf-8\n");
 		return;
 	}
 
 	resp_begin_html(200, NULL);
-	resp_searchform((const struct req *)arg);
+	resp_searchform(req);
 
-	if (0 == sz)
-		puts("<P>No results found.</P>");
+	puts("<DIV CLASS=\"results\">");
 
-	for (i = 0; i < (int)sz; i++) {
-		printf("<P><A HREF=\"");
-		html_print(progname);
-		printf("/show/%u/%u.html\">", r[i].volume, r[i].rec);
-		html_print(r[i].title);
-		putchar('(');
-		html_print(r[i].cat);
-		if (r[i].arch && '\0' != *r[i].arch) {
-			putchar('/');
-			html_print(r[i].arch);
-		}
-		printf(")</A> ");
-		html_print(r[i].desc);
-		puts("</P>");
+	if (0 == sz) {
+		puts("<P>\n"
+		     "No results found.\n"
+		     "</P>\n"
+		     "</DIV>");
+		resp_end_html();
+		return;
 	}
 
+	qsort(r, sz, sizeof(struct manpage), cmp);
+
+	puts("<TABLE>");
+
+	for (i = 0; i < sz; i++) {
+		printf("<TR>\n"
+		       "<TD CLASS=\"title\">\n"
+		       "<A HREF=\"%s/show/%s/%s?", 
+		    scriptname, req->q.manpath, r[i].file);
+		html_printquery(req);
+		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>");
 	resp_end_html();
 }
 
 /* ARGSUSED */
 static void
-pg_index(const struct manpaths *ps, const struct req *req, char *path)
+pg_index(const struct req *req, char *path)
 {
 
 	resp_index(req);
 }
 
 static void
-catman(const char *file)
+catman(const struct req *req, const char *file)
 {
-	int		 fd;
-	char		 buf[BUFSIZ];
-	ssize_t		 ssz;
+	FILE		*f;
+	size_t		 len;
+	int		 i;
+	char		*p;
+	int		 italic, bold;
 
-	if (-1 == (fd = open(file, O_RDONLY, 0))) {
+	if (NULL == (f = fopen(file, "r"))) {
 		resp_baddb();
 		return;
 	}
 
-	resp_begin_http(200, NULL);
+	resp_begin_html(200, NULL);
+	resp_searchform(req);
+	puts("<DIV CLASS=\"catman\">\n"
+	     "<PRE>");
 
-	while ((ssz = read(fd, buf, BUFSIZ)) > 0)
-		write(STDOUT_FILENO, buf, (size_t)ssz);
+	while (NULL != (p = fgetln(f, &len))) {
+		bold = italic = 0;
+		for (i = 0; i < (int)len - 1; i++) {
+			/* 
+			 * This means that the catpage is out of state.
+			 * Ignore it and keep going (although the
+			 * catpage is bogus).
+			 */
 
-	if (ssz < 0)
-		perror(file);
+			if ('\b' == p[i] || '\n' == p[i])
+				continue;
 
-	close(fd);
+			/*
+			 * Print a regular character.
+			 * Close out any bold/italic scopes.
+			 * If we're in back-space mode, make sure we'll
+			 * have something to enter when we backspace.
+			 */
+
+			if ('\b' != p[i + 1]) {
+				if (italic)
+					printf("</I>");
+				if (bold)
+					printf("</B>");
+				italic = bold = 0;
+				html_putchar(p[i]);
+				continue;
+			} else if (i + 2 >= (int)len)
+				continue;
+
+			/* Italic mode. */
+
+			if ('_' == p[i]) {
+				if (bold)
+					printf("</B>");
+				if ( ! italic)
+					printf("<I>");
+				bold = 0;
+				italic = 1;
+				i += 2;
+				html_putchar(p[i]);
+				continue;
+			}
+
+			/* 
+			 * Handle funny behaviour troff-isms.
+			 * These grok'd from the original man2html.c.
+			 */
+
+			if (('+' == p[i] && 'o' == p[i + 2]) ||
+					('o' == p[i] && '+' == p[i + 2]) ||
+					('|' == p[i] && '=' == p[i + 2]) ||
+					('=' == p[i] && '|' == p[i + 2]) ||
+					('*' == p[i] && '=' == p[i + 2]) ||
+					('=' == p[i] && '*' == p[i + 2]) ||
+					('*' == p[i] && '|' == p[i + 2]) ||
+					('|' == p[i] && '*' == p[i + 2]))  {
+				if (italic)
+					printf("</I>");
+				if (bold)
+					printf("</B>");
+				italic = bold = 0;
+				putchar('*');
+				i += 2;
+				continue;
+			} else if (('|' == p[i] && '-' == p[i + 2]) ||
+					('-' == p[i] && '|' == p[i + 1]) ||
+					('+' == p[i] && '-' == p[i + 1]) ||
+					('-' == p[i] && '+' == p[i + 1]) ||
+					('+' == p[i] && '|' == p[i + 1]) ||
+					('|' == p[i] && '+' == p[i + 1]))  {
+				if (italic)
+					printf("</I>");
+				if (bold)
+					printf("</B>");
+				italic = bold = 0;
+				putchar('+');
+				i += 2;
+				continue;
+			}
+
+			/* Bold mode. */
+			
+			if (italic)
+				printf("</I>");
+			if ( ! bold)
+				printf("<B>");
+			bold = 1;
+			italic = 0;
+			i += 2;
+			html_putchar(p[i]);
+		}
+
+		/* 
+		 * Clean up the last character.
+		 * We can get to a newline; don't print that. 
+		 */
+
+		if (italic)
+			printf("</I>");
+		if (bold)
+			printf("</B>");
+
+		if (i == (int)len - 1 && '\n' != p[i])
+			html_putchar(p[i]);
+
+		putchar('\n');
+	}
+
+	puts("</PRE>\n"
+	     "</DIV>\n"
+	     "</BODY>\n"
+	     "</HTML>");
+
+	fclose(f);
 }
 
 static void
-format(const char *file)
+format(const struct req *req, const char *file)
 {
 	struct mparse	*mp;
 	int		 fd;
@@ -477,13 +671,15 @@ format(const char *file)
 	struct man	*man;
 	void		*vp;
 	enum mandoclevel rc;
+	char		 opts[PATH_MAX + 128];
 
 	if (-1 == (fd = open(file, O_RDONLY, 0))) {
 		resp_baddb();
 		return;
 	}
 
-	mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
+	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
+	    req->q.manpath);
 	rc = mparse_readfd(mp, fd, file);
 	close(fd);
 
@@ -492,126 +688,108 @@ format(const char *file)
 		return;
 	}
 
-	mparse_result(mp, &mdoc, &man);
-	vp = html_alloc(NULL);
+	snprintf(opts, sizeof(opts),
+	    "fragment,man=%s/search?sec=%%S&expr=Nm~^%%N$",
+	    scriptname);
 
-	if (NULL != mdoc) {
-		resp_begin_http(200, NULL);
+	mparse_result(mp, &mdoc, &man, NULL);
+	if (NULL == man && NULL == mdoc) {
+		resp_baddb();
+		mparse_free(mp);
+		return;
+	}
+
+	resp_begin_html(200, NULL);
+	resp_searchform(req);
+
+	vp = html_alloc(opts);
+
+	if (NULL != mdoc)
 		html_mdoc(vp, mdoc);
-	} else if (NULL != man) {
-		resp_begin_http(200, NULL);
+	else
 		html_man(vp, man);
-	} else
-		resp_baddb();
 
+	puts("</BODY>\n"
+	     "</HTML>");
+
 	html_free(vp);
 	mparse_free(mp);
 }
 
 static void
-pg_show(const struct manpaths *ps, const struct req *req, char *path)
+pg_show(const struct req *req, char *path)
 {
 	char		*sub;
-	char		 file[MAXPATHLEN];
-	const char	*fn, *cp;
-	int		 rc;
-	unsigned int	 vol, rec;
-	DB		*idx;
-	DBT		 key, val;
 
-	if (NULL == path) {
-		resp_badmanual();
+	if (NULL == path || NULL == (sub = strchr(path, '/'))) {
+		resp_error400();
 		return;
-	} else if (NULL == (sub = strrchr(path, '/'))) {
-		resp_badmanual();
-		return;
-	} else
-		*sub++ = '\0';
+	} 
+	*sub++ = '\0';
 
-	if ( ! (atou(path, &vol) && atou(sub, &rec))) {
-		resp_badmanual();
-		return;
-	} else if (vol >= (unsigned int)ps->sz) {
-		resp_badmanual();
-		return;
-	}
+	/*
+	 * Begin by chdir()ing into the manpath.
+	 * This way we can pick up the database files, which are
+	 * relative to the manpath root.
+	 */
 
-	strlcpy(file, ps->paths[vol], MAXPATHLEN);
-	strlcat(file, "/mandoc.index", MAXPATHLEN);
-
-	/* Open the index recno(3) database. */
-
-	idx = dbopen(file, O_RDONLY, 0, DB_RECNO, NULL);
-	if (NULL == idx) {
+	if (-1 == chdir(path)) {
+		perror(path);
 		resp_baddb();
 		return;
 	}
 
-	key.data = &rec;
-	key.size = 4;
-
-	if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) {
-		rc < 0 ? resp_baddb() : resp_badmanual();
-		goto out;
-	} 
-
-	cp = (char *)val.data;
-
-	if (NULL == (fn = memchr(cp, '\0', val.size)))
-		resp_baddb();
-	else if (++fn - cp >= (int)val.size)
-		resp_baddb();
-	else if (NULL == memchr(fn, '\0', val.size - (fn - cp)))
-		resp_baddb();
-	else {
-		strlcpy(file, ps->paths[vol], MAXPATHLEN);
-		strlcat(file, "/", MAXPATHLEN);
-		strlcat(file, fn, MAXPATHLEN);
-		if (0 == strcmp(cp, "cat"))
-			catman(file);
-		else
-			format(file);
-	}
-out:
-	(*idx->close)(idx);
+	if ('c' == *sub)
+		catman(req, sub);
+	else
+		format(req, sub);
 }
 
 static void
-pg_search(const struct manpaths *ps, const struct req *req, char *path)
+pg_search(const struct req *req, char *path)
 {
-	size_t		  tt;
-	int		  i, sz, rc;
-	const char	 *ep, *start;
-	char		**cp;
-	struct opts	  opt;
-	struct expr	 *expr;
+	struct mansearch	  search;
+	struct manpaths		  paths;
+	struct manpage		 *res;
+	char			**cp;
+	const char		 *ep, *start;
+	size_t			  ressz;
+	int			  i, sz;
 
-	expr = NULL;
-	cp = NULL;
-	ep = NULL;
-	sz = 0;
+	/*
+	 * Begin by chdir()ing into the root of the manpath.
+	 * This way we can pick up the database files, which are
+	 * relative to the manpath root.
+	 */
 
-	memset(&opt, 0, sizeof(struct opts));
+	if (-1 == (chdir(req->q.manpath))) {
+		perror(req->q.manpath);
+		resp_search(req, NULL, 0);
+		return;
+	}
 
-	for (sz = i = 0; i < (int)req->fieldsz; i++)
-		if (0 == strcmp(req->fields[i].key, "expr"))
-			ep = req->fields[i].val;
-		else if (0 == strcmp(req->fields[i].key, "sec"))
-			opt.cat = req->fields[i].val;
-		else if (0 == strcmp(req->fields[i].key, "arch"))
-			opt.arch = req->fields[i].val;
+	search.arch = req->q.arch;
+	search.sec = req->q.sec;
+	search.deftype = TYPE_Nm | TYPE_Nd;
+	search.flags = 0;
 
+	paths.sz = 1;
+	paths.paths = mandoc_malloc(sizeof(char *));
+	paths.paths[0] = mandoc_strdup(".");
+
 	/*
-	 * Poor man's tokenisation.
-	 * Just break apart by spaces.
+	 * Poor man's tokenisation: just break apart by spaces.
 	 * Yes, this is half-ass.  But it works for now.
 	 */
 
+	ep = req->q.expr;
 	while (ep && isspace((unsigned char)*ep))
 		ep++;
 
+	sz = 0;
+	cp = NULL;
 	while (ep && '\0' != *ep) {
-		cp = mandoc_realloc(cp, (sz + 1) * sizeof(char *));
+		cp = mandoc_reallocarray(cp, sz + 1, sizeof(char *));
 		start = ep;
 		while ('\0' != *ep && ! isspace((unsigned char)*ep))
 			ep++;
@@ -622,30 +800,24 @@ pg_search(const struct manpaths *ps, const struct req 
 			ep++;
 	}
 
-	rc = -1;
-
-	/*
-	 * Pump down into apropos backend.
-	 * The resp_search() function is called with the results.
-	 */
-
-	if (NULL != (expr = exprcomp(sz, cp, &tt)))
-		rc = apropos_search
-			(ps->sz, ps->paths, &opt,
-			 expr, tt, (void *)req, resp_search);
-
-	/* ...unless errors occured. */
-
-	if (0 == rc)
+	if (mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz))
+		resp_search(req, res, ressz);
+	else
 		resp_baddb();
-	else if (-1 == rc)
-		resp_badexpr(req);
 
 	for (i = 0; i < sz; i++)
 		free(cp[i]);
-
 	free(cp);
-	exprfree(expr);
+
+	for (i = 0; i < (int)ressz; i++) {
+		free(res[i].file);
+		free(res[i].names);
+		free(res[i].output);
+	}
+	free(res);
+
+	free(paths.paths[0]);
+	free(paths.paths);
 }
 
 int
@@ -653,35 +825,50 @@ main(void)
 {
 	int		 i;
 	struct req	 req;
-	char		*p, *path, *subpath;
-	struct manpaths	 paths;
+	char		*querystring, *path, *subpath;
 
-	/* HTTP init: read and parse the query string. */
+	/* Scan our run-time environment. */
 
-	progname = getenv("SCRIPT_NAME");
-	if (NULL == progname)
-		progname = "";
+	if (NULL == (mandir = getenv("MAN_DIR")))
+		mandir = "/man";
 
-	cache = getenv("CACHE_DIR");
-	if (NULL == cache)
-		cache = "/cache/man.cgi";
+	if (NULL == (scriptname = getenv("SCRIPT_NAME")))
+		scriptname = "";
 
-	if (-1 == chdir(cache)) {
+	if (NULL == (cssdir = getenv("CSS_DIR")))
+		cssdir = "";
+
+	if (NULL == (httphost = getenv("HTTP_HOST")))
+		httphost = "localhost";
+
+	/*
+	 * First we change directory into the mandir so that
+	 * subsequent scanning for manpath directories is rooted
+	 * relative to the same position.
+	 */
+
+	if (-1 == chdir(mandir)) {
+		fprintf(stderr, "MAN_DIR: %s: %s\n",
+		    mandir, strerror(errno));
 		resp_bad();
 		return(EXIT_FAILURE);
-	}
+	} 
 
-	host = getenv("HTTP_HOST");
-	if (NULL == host)
-		host = "localhost";
-
 	memset(&req, 0, sizeof(struct req));
+	pathgen(&req);
 
-	if (NULL != (p = getenv("QUERY_STRING")))
-		kval_parse(&req.fields, &req.fieldsz, p);
+	/* Next parse out the query string. */
 
-	/* Resolve leading subpath component. */
+	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. 
+	 */
+
 	subpath = path = NULL;
 	req.page = PAGE__MAX;
 
@@ -691,12 +878,6 @@ main(void)
 	if (NULL != path && '/' == *path && '\0' == *++path)
 		req.page = PAGE_INDEX;
 
-	/* Strip file suffix. */
-
-	if (NULL != path && NULL != (p = strrchr(path, '.')))
-		if (NULL != p && NULL == strchr(p, '/'))
-			*p++ = '\0';
-
 	/* Resolve subpath component. */
 
 	if (NULL != path && NULL != (subpath = strchr(path, '/')))
@@ -711,30 +892,55 @@ main(void)
 				break;
 			}
 
-	/* Initialise MANPATH. */
-
-	memset(&paths, 0, sizeof(struct manpaths));
-	manpath_manconf("etc/catman.conf", &paths);
-
 	/* Route pages. */
 
 	switch (req.page) {
 	case (PAGE_INDEX):
-		pg_index(&paths, &req, subpath);
+		pg_index(&req, subpath);
 		break;
 	case (PAGE_SEARCH):
-		pg_search(&paths, &req, subpath);
+		pg_search(&req, subpath);
 		break;
 	case (PAGE_SHOW):
-		pg_show(&paths, &req, subpath);
+		pg_show(&req, subpath);
 		break;
 	default:
-		resp_badpage();
+		resp_error404(path);
 		break;
 	}
 
-	manpath_free(&paths);
-	kval_free(req.fields, req.fieldsz);
-
+	for (i = 0; i < (int)req.psz; i++)
+		free(req.p[i]);
+	free(req.p);
 	return(EXIT_SUCCESS);
+}
+
+static int
+cmp(const void *p1, const void *p2)
+{
+
+	return(strcasecmp(((const struct manpage *)p1)->names,
+	    ((const struct manpage *)p2)->names));
+}
+
+/*
+ * Scan for indexable paths.
+ */
+static void
+pathgen(struct req *req)
+{
+	FILE	*fp;
+	char	*dp;
+	size_t	 dpsz;
+
+	if (NULL == (fp = fopen("manpath.conf", "r")))
+		return;
+
+	while (NULL != (dp = fgetln(fp, &dpsz))) {
+		if ('\n' == dp[dpsz - 1])
+			dpsz--;
+		req->p = mandoc_realloc(req->p,
+		    (req->psz + 1) * sizeof(char *));
+		req->p[req->psz++] = mandoc_strndup(dp, dpsz);
+	}
 }