X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/2671d8b5f928661e34f3b3a25984aa41fadeef1c..fa1118391546bb5404249b79fd20ebc72f5e4bab:/cgi.c?ds=sidebyside diff --git a/cgi.c b/cgi.c index 755318b9..284e4883 100644 --- a/cgi.c +++ b/cgi.c @@ -1,6 +1,7 @@ -/* $Id: cgi.c,v 1.19 2011/12/08 22:47:09 kristaps Exp $ */ +/* $Id: cgi.c,v 1.61 2014/07/10 00:52:50 schwarze Exp $ */ /* - * Copyright (c) 2011 Kristaps Dzonsons + * Copyright (c) 2011, 2012 Kristaps Dzonsons + * Copyright (c) 2014 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,34 +19,20 @@ #include "config.h" #endif -#include -#include - -#include #include #include #include #include -#include #include -#include -#include #include #include #include -#include "apropos_db.h" #include "mandoc.h" -#include "mdoc.h" -#include "man.h" +#include "mandoc_aux.h" #include "main.h" #include "manpath.h" - -#ifdef __linux__ -# include -#else -# include -#endif +#include "mansearch.h" enum page { PAGE_INDEX, @@ -54,46 +41,56 @@ 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 catman(const struct req *, const char *); static int cmp(const void *, const void *); -static void format(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 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 resp_bad(void); -static void resp_baddb(void); -static void resp_error400(void); -static void resp_error404(const 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_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_search(struct res *, size_t, void *); +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 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 */ @@ -102,28 +99,9 @@ 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) -{ - 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); - - *v = (unsigned int)lval; - return(1); -} - static void html_putchar(char c) { @@ -147,9 +125,63 @@ html_putchar(char c) } } +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("&manpath="); + html_print(req->q.manpath); + } + if (NULL != req->q.sec) { + printf("&sec="); + html_print(req->q.sec); + } + if (NULL != req->q.arch) { + printf("&arch="); + html_print(req->q.arch); + } + if (NULL != req->q.expr) { + printf("&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) @@ -161,79 +193,86 @@ html_print(const char *p) 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; - - while (p && '\0' != *p) { - while (' ' == *p) - p++; + memset(&req->q, 0, sizeof(struct query)); + req->q.manpath = req->p[0]; + 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; - - sz = strcspn(p, ";&"); - /* LINTED */ - p += sz; - - if ('\0' != *p) - *p++ = '\0'; - } else { - p = key; - sz = strcspn(p, ";&"); - /* LINTED */ - p += sz; - - if ('\0' != *p) - p++; - continue; - } + if (NULL != (val = strchr(key, '='))) + *val++ = '\0'; - if ('\0' == *key || '\0' == *val) + if ('\0' == *key || NULL == val || '\0' == *val) continue; /* Just abort handling. */ - if ( ! kval_decode(key)) - return; - if ( ! kval_decode(val)) - return; + if ( ! http_decode(key)) + break; + if (NULL != val && ! http_decode(val)) + break; + + 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"); + } - if (*kvsz + 1 >= cur) { - cur++; - *kv = mandoc_realloc - (*kv, cur * sizeof(struct kval)); - } + /* Test for old man.cgi compatibility mode. */ - (*kv)[(int)*kvsz].key = mandoc_strdup(key); - (*kv)[(int)*kvsz].val = mandoc_strdup(val); - (*kvsz)++; + 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 +http_putchar(char c) +{ + + if (isalnum((unsigned char)c)) { + putchar((unsigned char)c); + return; + } else if (' ' == c) { + putchar('+'); + return; } + printf("%%%.2x", c); } /* @@ -242,7 +281,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; @@ -277,9 +316,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); @@ -291,145 +330,154 @@ resp_begin_html(int code, const char *msg) resp_begin_http(code, msg); - puts("" "\n" - "" "\n" - " " "\n" - " " "\n" - " " "\n" - " System Manpage Reference" "\n" - " " "\n" - " " "\n" - ""); + printf("\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "System Manpage Reference\n" + "\n" + "\n" + "\n", + cssdir, cssdir); } static void resp_end_html(void) { - puts(" \n"); + puts("\n" + ""); } static void resp_searchform(const struct req *req) { - int i; - const char *expr, *sec, *arch; - - 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, "query")) - 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, "sektion")) - sec = req->fields[i].val; - else if (0 == strcmp(req->fields[i].key, "arch")) - arch = req->fields[i].val; - - if (NULL != sec && 0 == strcmp(sec, "0")) - sec = NULL; + int i; puts(""); - printf("
\n"); - printf("
\n" + printf("
\n" + "\n" + "
\n" "Search Parameters\n" - " or \n" - " for manuals satisfying \n" - " for manuals matching \n" + "q.expr ? req->q.expr : ""); printf("\">, section " - "q.sec ? req->q.sec : ""); printf("\">, arch " - ".\n" + "q.arch ? req->q.arch : ""); + printf("\">"); + if (req->psz > 1) { + puts(", in "); + } + puts("—\n" "\n" "
\n" "\n" - ""); + "
"); + puts(""); } static void resp_index(const struct req *req) { + resp_begin_html(200, NULL); + puts("

\n" + "Online manuals with " + "mandoc\n" + "

"); + resp_searchform(req); + puts("

\n" + "This web interface is documented in the " + "" + "man.cgi manual, and the " + "" + "apropos manual explains the query syntax.\n" + "

"); + resp_end_html(); +} + +static void +resp_noresult(const struct req *req, const char *msg) +{ resp_begin_html(200, NULL); resp_searchform(req); + puts("

"); + puts(msg); + puts("

"); resp_end_html(); } static void -resp_error400(void) +resp_error_badrequest(const char *msg) { - resp_begin_html(400, "Query Malformed"); - printf("

Malformed Query

\n" - "

\n" - " The query your entered was malformed.\n" - " Try again from the\n" - " main page\n" - "

", progname); + resp_begin_html(400, "Bad Request"); + puts("

Bad Request

\n" + "

\n"); + puts(msg); + printf("Try again from the\n" + "main page.\n" + "

", scriptname); resp_end_html(); } static void -resp_error404(const char *page) +resp_error_notfound(const char *page) { resp_begin_html(404, "Not Found"); puts("

Page Not Found

\n" "

\n" - " The page you're looking for, "); - printf(" "); + "The page you're looking for, "); + printf(""); html_print(page); printf(",\n" - " could not be found.\n" - " Try searching from the\n" - " main page\n" - "

", progname); - resp_end_html(); -} - -static void -resp_bad(void) -{ - resp_begin_html(500, "Internal Server Error"); - puts("

Generic badness happened.

"); + "could not be found.\n" + "Try searching from the\n" + "main page.\n" + "

", scriptname); resp_end_html(); } static void -resp_baddb(void) +resp_error_internal(void) { - resp_begin_html(500, "Internal Server Error"); - puts("

Your database is broken.

"); + puts("

Internal Server Error

"); resp_end_html(); } 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, whatis; - const char *ep, *sec, *arch; - const struct req *req; - - whatis = 1; - ep = sec = arch = NULL; + size_t i; if (1 == sz) { /* @@ -437,91 +485,52 @@ 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; } - req = (const struct req *)arg; - - for (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, "query")) - ep = 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, "sektion")) - sec = req->fields[i].val; - else if (0 == strcmp(req->fields[i].key, "arch")) - arch = req->fields[i].val; - else if (0 == strcmp(req->fields[i].key, "apropos")) - whatis = 0 == strcmp - (req->fields[i].val, "0"); - else if (0 == strcmp(req->fields[i].key, "op")) - whatis = 0 == strcasecmp - (req->fields[i].val, "whatis"); - - qsort(r, sz, sizeof(struct res), cmp); + qsort(r, sz, sizeof(struct manpage), cmp); resp_begin_html(200, NULL); resp_searchform(req); - - if (0 == sz) { - puts("

\n" - "No results found."); - if (whatis) { - printf("(Try apropos?)"); - } - puts("

"); - resp_end_html(); - return; - } - - puts("

\n" - ""); - - for (i = 0; i < (int)sz; i++) { - printf(""); + puts("
"); + puts("
", 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(")"); - html_print(r[i].desc); - puts("
"); + + for (i = 0; i < sz; i++) { + printf("\n" + "\n" + "\n" + ""); } - puts("
\n" + "q.manpath, r[i].file); + html_printquery(req); + printf("\">"); + html_print(r[i].names); + printf("\n" + ""); + html_print(r[i].output); + puts("
"); - + puts("\n" + ""); 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) { FILE *f; size_t len; @@ -530,26 +539,16 @@ catman(const char *file) int italic, bold; if (NULL == (f = fopen(file, "r"))) { - resp_baddb(); + resp_error_badrequest( + "You specified an invalid manual file."); return; } - resp_begin_http(200, NULL); - puts("" "\n" - "" "\n" - " " "\n" - " " "\n" - " " "\n" - " System Manpage Reference" "\n" - " " "\n" - " " "\n" - ""); - - puts("
");
+	resp_begin_html(200, NULL);
+	resp_searchform(req);
+	puts("
\n"
+	     "
");
+
 	while (NULL != (p = fgetln(f, &len))) {
 		bold = italic = 0;
 		for (i = 0; i < (int)len - 1; i++) {
@@ -660,6 +659,7 @@ catman(const char *file)
 	}
 
 	puts("
\n"
+	     "
\n"
 	     "\n"
 	     "");
 
@@ -667,7 +667,7 @@ catman(const char *file)
 }
 
 static void
-format(const char *file)
+format(const struct req *req, const char *file)
 {
 	struct mparse	*mp;
 	int		 fd;
@@ -675,161 +675,131 @@ format(const char *file)
 	struct man	*man;
 	void		*vp;
 	enum mandoclevel rc;
-	char		 opts[MAXPATHLEN + 128];
+	char		 opts[PATH_MAX + 128];
 
 	if (-1 == (fd = open(file, O_RDONLY, 0))) {
-		resp_baddb();
+		resp_error_badrequest(
+		    "You specified an invalid manual file.");
 		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);
 
 	if (rc >= MANDOCLEVEL_FATAL) {
-		resp_baddb();
+		fprintf(stderr, "fatal mandoc error: %s/%s\n",
+		    req->q.manpath, file);
+		resp_error_internal();
 		return;
 	}
 
-	snprintf(opts, sizeof(opts), "style=/man.css,"
-			"man=%s/search.html?sec=%%S&expr=%%N,"
-			/*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/,
-			progname);
+	snprintf(opts, sizeof(opts),
+	    "fragment,man=%s/search?sec=%%S&expr=Nm~^%%N$",
+	    scriptname);
+
+	mparse_result(mp, &mdoc, &man, NULL);
+	if (NULL == man && NULL == mdoc) {
+		fprintf(stderr, "fatal mandoc error: %s/%s\n",
+		    req->q.manpath, file);
+		resp_error_internal();
+		mparse_free(mp);
+		return;
+	}
+
+	resp_begin_html(200, NULL);
+	resp_searchform(req);
 
-	mparse_result(mp, &mdoc, &man);
 	vp = html_alloc(opts);
 
-	if (NULL != mdoc) {
-		resp_begin_http(200, NULL);
+	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("\n"
+	     "");
 
 	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_error400();
-		return;
-	} else if (NULL == (sub = strrchr(path, '/'))) {
-		resp_error400();
-		return;
-	} else
-		*sub++ = '\0';
 
-	if ( ! (atou(path, &vol) && atou(sub, &rec))) {
-		resp_error400();
+	if (NULL == path || NULL == (sub = strchr(path, '/'))) {
+		resp_error_badrequest(
+		    "You did not specify a page to show.");
 		return;
-	} else if (vol >= (unsigned int)ps->sz) {
-		resp_error400();
-		return;
-	}
-
-	strlcpy(file, ps->paths[vol], MAXPATHLEN);
-	strlcat(file, "/mandoc.index", MAXPATHLEN);
+	} 
+	*sub++ = '\0';
 
-	/* Open the index recno(3) database. */
+	/*
+	 * Begin by chdir()ing into the manpath.
+	 * This way we can pick up the database files, which are
+	 * relative to the manpath root.
+	 */
 
-	idx = dbopen(file, O_RDONLY, 0, DB_RECNO, NULL);
-	if (NULL == idx) {
-		resp_baddb();
+	if (-1 == chdir(path)) {
+		resp_error_badrequest(
+		    "You specified an invalid manpath.");
 		return;
 	}
 
-	key.data = &rec;
-	key.size = 4;
-
-	if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) {
-		rc < 0 ? resp_baddb() : resp_error400();
-		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, cache, 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, whatis;
-	const char	 *ep, *start;
-	char		**cp;
-	struct opts	  opt;
-	struct expr	 *expr;
-
-	expr = NULL;
-	cp = NULL;
-	ep = NULL;
-	sz = 0;
-	whatis = 1;
-
-	memset(&opt, 0, sizeof(struct opts));
-
-	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, "query"))
-			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, "sektion"))
-			opt.cat = req->fields[i].val;
-		else if (0 == strcmp(req->fields[i].key, "arch"))
-			opt.arch = req->fields[i].val;
-		else if (0 == strcmp(req->fields[i].key, "apropos"))
-			whatis = 0 == strcmp
-				(req->fields[i].val, "0");
-		else if (0 == strcmp(req->fields[i].key, "op"))
-			whatis = 0 == strcasecmp
-				(req->fields[i].val, "whatis");
-
-	if (NULL != opt.cat && 0 == strcmp(opt.cat, "0"))
-		opt.cat = NULL;
+	struct mansearch	  search;
+	struct manpaths		  paths;
+	struct manpage		 *res;
+	char			**cp;
+	const char		 *ep, *start;
+	size_t			  ressz;
+	int			  i, sz;
+
+	/*
+	 * 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.
+	 */
+
+	if (-1 == (chdir(req->q.manpath))) {
+		resp_error_badrequest(
+		    "You specified an invalid manpath.");
+		return;
+	}
+
+	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++;
@@ -840,33 +810,26 @@ pg_search(const struct manpaths *ps, const struct req *req, char *path)
 			ep++;
 	}
 
-	rc = -1;
-
-	/*
-	 * Pump down into apropos backend.
-	 * The resp_search() function is called with the results.
-	 */
-
-	expr = whatis ? termcomp(sz, cp, &tt) :
-		        exprcomp(sz, cp, &tt);
-
-	if (NULL != expr)
-		rc = apropos_search
-			(ps->sz, ps->paths, &opt,
-			 expr, tt, (void *)req, resp_search);
-
-	/* ...unless errors occured. */
-
-	if (0 == rc)
-		resp_baddb();
-	else if (-1 == rc)
-		resp_search(NULL, 0, (void *)req);
+	if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz))
+		resp_noresult(req, "You entered an invalid query.");
+	else if (0 == ressz)
+		resp_noresult(req, "No results found.");
+	else
+		resp_search(req, res, ressz);
 
 	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
@@ -874,34 +837,49 @@ 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)) {
-		resp_bad();
-		return(EXIT_FAILURE);
-	}
+	if (NULL == (cssdir = getenv("CSS_DIR")))
+		cssdir = "";
 
-	host = getenv("HTTP_HOST");
-	if (NULL == host)
-		host = "localhost";
+	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_error_internal();
+		return(EXIT_FAILURE);
+	} 
 
 	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;
@@ -912,12 +890,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, '/')))
@@ -932,31 +904,26 @@ 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_error404(path);
+		resp_error_notfound(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);
 }
 
@@ -964,7 +931,28 @@ static int
 cmp(const void *p1, const void *p2)
 {
 
-	return(strcasecmp(((const struct res *)p1)->title,
-				((const struct res *)p2)->title));
+	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);
+	}
+}