]> git.cameronkatri.com Git - mandoc.git/blobdiff - cgi.c
Make the calltree a bit easier to understand by giving the
[mandoc.git] / cgi.c
diff --git a/cgi.c b/cgi.c
index ac9438e26792be2ac8e46094642731b2d9a69b5b..00f033ef4386c513823704cdf0528d2e708c0b70 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,6 +1,7 @@
-/*     $Id: cgi.c,v 1.6 2011/11/23 10:01:04 kristaps Exp $ */
+/*     $Id: cgi.c,v 1.72 2014/07/13 12:55:45 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
 #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 "mandoc_aux.h"
+#include "main.h"
 #include "manpath.h"
+#include "mansearch.h"
+#include "cgi.h"
 
-#ifdef __linux__
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-enum   page {
-       PAGE_INDEX,
-       PAGE_SEARCH,
-       PAGE_SHOW,
-       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              equal; /* match whole names, not substrings */
 };
 
 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 */
 };
 
-static int              atou(const char *, unsigned *);
+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             resp_baddb(void);
-static void             resp_badexpr(const struct req *);
-static void             resp_badmanual(void);
+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_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_index(const struct req *);
-static void             resp_search(struct res *, size_t, void *);
 static void             resp_searchform(const struct req *);
+static void             resp_show(const struct req *, const char *);
 
-static const char       *progname;
-static const char       *host;
+static const char       *scriptname; /* CGI script name */
+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 */
+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"
+};
+static const char *const sec_names[] = {
+    "All Sections",
+    "1 - General Commands",
+    "2 - System Calls",
+    "3 - Subroutines",
+    "3p - Perl Subroutines",
+    "4 - Special Files",
+    "5 - File Formats",
+    "6 - Games",
+    "7 - Macros and Conventions",
+    "8 - Maintenance Commands",
+    "9 - Kernel Interface"
+};
+static const int sec_MAX = sizeof(sec_names) / sizeof(char *);
+
+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",
+    "amiga",       "arc",         "arm32",       "atari",
+    "beagle",      "cats",        "hp300",       "mac68k",
+    "mvme68k",     "mvme88k",     "mvmeppc",     "palm",
+    "pc532",       "pegasos",     "pmax",        "powerpc",
+    "sun3",        "wgrisc",      "x68k"
 };
+static const int arch_MAX = sizeof(arch_names) / sizeof(char *);
 
 /*
- * 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);
-
-       *v = (unsigned int)lval;
-       return(1);
+
+       switch (c) {
+       case ('"'):
+               printf("&quote;");
+               break;
+       case ('&'):
+               printf("&amp;");
+               break;
+       case ('>'):
+               printf("&gt;");
+               break;
+       case ('<'):
+               printf("&lt;");
+               break;
+       default:
+               putchar((unsigned char)c);
+               break;
+       }
 }
 
-/*
- * Print a word, escaping HTML along the way.
- * This will pass non-ASCII straight to output: be warned!
- */
 static void
-html_print(const char *p)
+http_printquery(const struct req *req)
 {
-       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;
-               }
+       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("&query=");
+               http_print(req->q.expr);
+       }
+       if (0 == req->q.equal)
+               printf("&apropos=1");
 }
 
 static void
-kval_free(struct kval *p, size_t sz)
+html_printquery(const struct req *req)
 {
-       int              i;
 
-       for (i = 0; i < (int)sz; i++) {
-               free(p[i].key);
-               free(p[i].val);
+       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);
        }
-       free(p);
+       if (NULL != req->q.expr) {
+               printf("&amp;query=");
+               html_print(req->q.expr);
+       }
+       if (0 == req->q.equal)
+               printf("&amp;apropos=1");
+}
+
+static void
+http_print(const char *p)
+{
+
+       if (NULL == p)
+               return;
+       while ('\0' != *p)
+               http_putchar(*p++);
+}
+
+/*
+ * Call through to html_putchar().
+ * Accepts NULL strings.
+ */
+static void
+html_print(const char *p)
+{
+       
+       if (NULL == p)
+               return;
+       while ('\0' != *p)
+               html_putchar(*p++);
 }
 
 /*
@@ -165,61 +220,63 @@ kval_free(struct kval *p, size_t sz)
  * 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;
-
-       cur = 0;
 
-       while (p && '\0' != *p) {
-               while (' ' == *p)
-                       p++;
+       memset(&req->q, 0, sizeof(struct query));
+       req->q.manpath = req->p[0];
+       req->q.equal = 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 (*kvsz + 1 >= cur) {
-                       cur++;
-                       *kv = mandoc_realloc
-                               (*kv, cur * sizeof(struct kval));
+               if (0 == strcmp(key, "query"))
+                       req->q.expr = val;
+               else if (0 == strcmp(key, "manpath"))
+                       req->q.manpath = val;
+               else if (0 == strcmp(key, "apropos"))
+                       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;
                }
+       }
+}
+
+static void
+http_putchar(char c)
+{
 
-               (*kv)[(int)*kvsz].key = mandoc_strdup(key);
-               (*kv)[(int)*kvsz].val = mandoc_strdup(val);
-               (*kvsz)++;
+       if (isalnum((unsigned char)c)) {
+               putchar((unsigned char)c);
+               return;
+       } else if (' ' == c) {
+               putchar('+');
+               return;
        }
+       printf("%%%.2x", c);
 }
 
 /*
@@ -228,14 +285,16 @@ 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];
+       char            *q;
        int              c;
 
        hex[2] = '\0';
 
-       for ( ; '\0' != *p; p++) {
+       q = p;
+       for ( ; '\0' != *p; p++, q++) {
                if ('%' == *p) {
                        if ('\0' == (hex[0] = *(p + 1)))
                                return(0);
@@ -246,13 +305,13 @@ kval_decode(char *p)
                        if ('\0' == c)
                                return(0);
 
-                       *p = (char)c;
-                       memmove(p + 1, p + 3, strlen(p + 3) + 1);
+                       *q = (char)c;
+                       p += 2;
                } else
-                       *p = '+' == *p ? ' ' : *p;
+                       *q = '+' == *p ? ' ' : *p;
        }
 
-       *p = '\0';
+       *q = '\0';
        return(1);
 }
 
@@ -261,12 +320,12 @@ resp_begin_http(int code, const char *msg)
 {
 
        if (200 != code)
-               printf("Status: %d %s\n", code, msg);
+               printf("Status: %d %s\r\n", code, msg);
 
-       puts("Content-Type: text/html; charset=utf-8"           "\n"
-            "Cache-Control: no-cache"                          "\n"
-            "Pragma: no-cache"                                 "\n"
-            "");
+       printf("Content-Type: text/html; charset=utf-8\r\n"
+            "Cache-Control: no-cache\r\n"
+            "Pragma: no-cache\r\n"
+            "\r\n");
 
        fflush(stdout);
 }
@@ -277,265 +336,521 @@ 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>%s</TITLE>\n"
+              "</HEAD>\n"
+              "<BODY>\n"
+              "<!-- Begin page content. //-->\n",
+              CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE);
 }
 
 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 = "";
+       puts(CUSTOMIZE_BEGIN);
+       puts("<!-- Begin search form. //-->");
+       printf("<DIV ID=\"mancgi\">\n"
+              "<FORM ACTION=\"%s\" METHOD=\"get\">\n"
+              "<FIELDSET>\n"
+              "<LEGEND>Manual Page Search Parameters</LEGEND>\n",
+              scriptname);
+
+       /* Write query input box. */
+
+       printf( "<TABLE><TR><TD>\n"
+               "<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\"");
+       if (NULL != req->q.expr)
+               html_print(req->q.expr);
+       puts("\" SIZE=\"40\">");
+
+       /* Write submission and reset buttons. */
+
+       printf( "<INPUT TYPE=\"submit\" VALUE=\"Submit\">\n"
+               "<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n");
+
+       /* Write show radio button */
+
+       printf( "</TD><TD>\n"
+               "<INPUT TYPE=\"radio\" ");
+       if (req->q.equal)
+               printf("CHECKED ");
+       printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n"
+               "<LABEL FOR=\"show\">Show named manual page</LABEL>\n");
+
+       /* Write section selector. */
+
+       printf( "</TD></TR><TR><TD>\n"
+               "<SELECT NAME=\"sec\">");
+       for (i = 0; i < sec_MAX; i++) {
+               printf("<OPTION VALUE=\"%s\"", sec_numbers[i]);
+               if (NULL != req->q.sec &&
+                   0 == strcmp(sec_numbers[i], req->q.sec))
+                       printf(" SELECTED");
+               printf(">%s</OPTION>\n", sec_names[i]);
+       }
+       puts("</SELECT>");
 
-       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;
+       /* Write architecture selector. */
 
-       puts("<!-- Begin search form. //-->");
-       printf("<FORM ACTION=\"");
-       html_print(progname);
-       printf("/search\" 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. //-->");
+       puts("<SELECT NAME=\"arch\">");
+       for (i = 0; i < arch_MAX; i++) {
+               printf("<OPTION VALUE=\"%s\"", arch_names[i]);
+               if (NULL != req->q.arch &&
+                   0 == strcmp(arch_names[i], req->q.arch))
+                       printf(" SELECTED");
+               printf(">%s</OPTION>\n", arch_names[i]);
+       }
+       puts("</SELECT>");
+
+       /* Write manpath selector. */
+
+       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 ");
+                       printf("VALUE=\"");
+                       html_print(req->p[i]);
+                       printf("\">");
+                       html_print(req->p[i]);
+                       puts("</OPTION>");
+               }
+               puts("</SELECT>");
+       }
+
+       /* Write search radio button */
+
+       printf( "</TD><TD>\n"
+               "<INPUT TYPE=\"radio\" ");
+       if (0 == req->q.equal)
+               printf("CHECKED ");
+       printf( "NAME=\"apropos\" ID=\"search\" VALUE=\"1\">\n"
+               "<LABEL FOR=\"search\">Search with apropos query</LABEL>\n");
+
+       puts("</TD></TR></TABLE>\n"
+            "</FIELDSET>\n"
+            "</FORM>\n"
+            "</DIV>");
+       puts("<!-- End search form. //-->");
 }
 
 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/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_badmanual(void)
+pg_noresult(const struct req *req, const char *msg)
 {
-
-       resp_begin_html(404, "Not Found");
-       puts("<P>Requested manual not found.</P>");
+       resp_begin_html(200, NULL);
+       resp_searchform(req);
+       puts("<P>");
+       puts(msg);
+       puts("</P>");
        resp_end_html();
 }
 
 static void
-resp_badexpr(const struct req *req)
+pg_error_badrequest(const char *msg)
 {
 
-       resp_begin_html(200, NULL);
-       resp_searchform(req);
-       puts("<P>Your search didn't work.</P>");
+       resp_begin_html(400, "Bad Request");
+       puts("<H1>Bad Request</H1>\n"
+            "<P>\n");
+       puts(msg);
+       printf("Try again from the\n"
+              "<A HREF=\"%s\">main page</A>.\n"
+              "</P>", scriptname);
        resp_end_html();
 }
 
 static void
-resp_baddb(void)
+pg_error_internal(void)
 {
-
        resp_begin_html(500, "Internal Server Error");
-       puts("<P>Your database is broken.</P>");
+       puts("<P>Internal Server Error</P>");
        resp_end_html();
 }
 
 static void
-resp_search(struct res *r, size_t sz, void *arg)
+pg_searchres(const struct req *req, struct manpage *r, size_t sz)
 {
-       int              i;
+       size_t           i, iuse, isec;
+       int              prio, priouse;
+       char             sec;
 
        if (1 == sz) {
                /*
                 * If we have just one result, then jump there now
                 * 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("Status: 303 See Other\r\n");
+               printf("Location: http://%s%s/%s/%s?",
+                   httphost, scriptname, req->q.manpath, r[0].file);
+               http_printquery(req);
+               printf("\r\n"
+                    "Content-Type: text/html; charset=utf-8\r\n"
+                    "\r\n");
                return;
        }
 
+       qsort(r, sz, sizeof(struct manpage), cmp);
+
        resp_begin_html(200, NULL);
-       resp_searchform((const struct req *)arg);
-
-       if (0 == sz)
-               puts("<P>No results found.</P>");
-
-       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);
+       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?", 
+                   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>");
+
+       /*
+        * 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;
                }
-               printf(")</A> ");
-               html_print(r[i].desc);
-               puts("</P>");
+               resp_show(req, r[iuse].file);
        }
 
        resp_end_html();
 }
 
-/* ARGSUSED */
 static void
-pg_index(const struct manpaths *ps, const struct req *req, char *path)
+catman(const struct req *req, const char *file)
 {
+       FILE            *f;
+       size_t           len;
+       int              i;
+       char            *p;
+       int              italic, bold;
+
+       if (NULL == (f = fopen(file, "r"))) {
+               puts("<P>You specified an invalid manual file.</P>");
+               return;
+       }
+
+       puts("<DIV CLASS=\"catman\">\n"
+            "<PRE>");
+
+       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 ('\b' == p[i] || '\n' == p[i])
+                               continue;
+
+                       /*
+                        * 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>");
 
-       resp_index(req);
+       fclose(f);
 }
 
 static void
-pg_show(const struct manpaths *ps, const struct req *req, char *path)
+format(const struct req *req, const char *file)
 {
-       pid_t            pid;
-       char            *sub;
-       char             file[MAXPATHLEN], cmd[MAXPATHLEN];
-       int              rc;
-       unsigned int     vol, rec;
-       DB              *db;
-       DBT              key, val;
-
-       if (NULL == path) {
-               resp_badmanual();
-               return;
-       } else if (NULL == (sub = strrchr(path, '/'))) {
-               resp_badmanual();
-               return;
-       } else
-               *sub++ = '\0';
-
-       if ( ! (atou(path, &vol) && atou(sub, &rec))) {
-               resp_badmanual();
-               return;
-       } else if (vol >= (unsigned int)ps->sz) {
-               resp_badmanual();
+       struct mparse   *mp;
+       int              fd;
+       struct mdoc     *mdoc;
+       struct man      *man;
+       void            *vp;
+       enum mandoclevel rc;
+       char             opts[PATH_MAX + 128];
+
+       if (-1 == (fd = open(file, O_RDONLY, 0))) {
+               puts("<P>You specified an invalid manual file.</P>");
                return;
        }
 
-       strlcpy(file, ps->paths[vol], MAXPATHLEN);
-       strlcat(file, "/mandoc.index", MAXPATHLEN);
-
-       /* Open the index recno(3) database. */
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
+           req->q.manpath);
+       rc = mparse_readfd(mp, fd, file);
+       close(fd);
 
-       db = dbopen(file, O_RDONLY, 0, DB_RECNO, NULL);
-       if (NULL == db) {
-               resp_baddb();
+       if (rc >= MANDOCLEVEL_FATAL) {
+               fprintf(stderr, "fatal mandoc error: %s/%s\n",
+                   req->q.manpath, file);
+               pg_error_internal();
                return;
        }
 
-       key.data = &rec;
-       key.size = 4;
+       snprintf(opts, sizeof(opts),
+           "fragment,man=%s?query=%%N&amp;sec=%%S",
+           scriptname);
 
-       if (0 != (rc = (*db->get)(db, &key, &val, 0))) {
-               rc < 0 ? resp_baddb() : resp_badmanual();
-               (*db->close)(db);
+       mparse_result(mp, &mdoc, &man, NULL);
+       if (NULL == man && NULL == mdoc) {
+               fprintf(stderr, "fatal mandoc error: %s/%s\n",
+                   req->q.manpath, file);
+               pg_error_internal();
+               mparse_free(mp);
                return;
-       } 
+       }
 
-       /* Extra filename: the first nil-terminated entry. */
+       vp = html_alloc(opts);
 
-       strlcpy(file, ps->paths[vol], MAXPATHLEN);
-       strlcat(file, "/", MAXPATHLEN);
-       strlcat(file, (char *)val.data, MAXPATHLEN);
+       if (NULL != mdoc)
+               html_mdoc(vp, mdoc);
+       else
+               html_man(vp, man);
 
-       (*db->close)(db);
+       html_free(vp);
+       mparse_free(mp);
+}
 
-       strlcpy(cmd, "man=", MAXPATHLEN);
-       strlcat(cmd, progname, MAXPATHLEN);
-       strlcat(cmd, "/search?expr=%N&sec=%S", MAXPATHLEN);
+static void
+resp_show(const struct req *req, const char *file)
+{
+       if ('.' == file[0] || '/' == file[1])
+               file += 2;
 
-       /* Get ready to call the child mandoc(1) process. */
+       if ('c' == *file)
+               catman(req, file);
+       else
+               format(req, file);
+}
 
-       if (-1 == (pid = fork()))
-               exit(EXIT_FAILURE);
+static void
+pg_show(const struct req *req, const char *path)
+{
+       char            *sub;
 
-       if (pid > 0) {
-               waitpid(pid, NULL, 0);
+       if (NULL == path || NULL == (sub = strchr(path, '/'))) {
+               pg_error_badrequest(
+                   "You did not specify a page to show.");
                return;
-       }
-
-       dup2(STDOUT_FILENO, STDERR_FILENO);
+       } 
+       *sub++ = '\0';
 
-       puts("Content-Type: text/html; charset=utf-8\n");
+       /*
+        * Begin by chdir()ing into the manpath.
+        * This way we can pick up the database files, which are
+        * relative to the manpath root.
+        */
 
-       fflush(stdout);
+       if (-1 == chdir(path)) {
+               pg_error_badrequest(
+                   "You specified an invalid manpath.");
+               return;
+       }
 
-       execlp("mandoc", "mandoc", "-T", 
-               "html", "-O", cmd, file, (char *)NULL);
+       resp_begin_html(200, NULL);
+       resp_searchform(req);
+       resp_show(req, sub);
+       resp_end_html();
 }
 
 static void
-pg_search(const struct manpaths *ps, const struct req *req, char *path)
+pg_search(const struct req *req)
 {
-       size_t            tt;
-       int               i, sz, rc;
-       const char       *ep, *start;
-       char            **cp;
-       struct opts       opt;
-       struct expr      *expr;
-
-       expr = NULL;
-       cp = NULL;
-       ep = NULL;
-       sz = 0;
+       struct mansearch          search;
+       struct manpaths           paths;
+       struct manpage           *res;
+       char                    **cp;
+       const char               *ep, *start;
+       size_t                    ressz;
+       int                       i, sz;
 
-       memset(&opt, 0, sizeof(struct opts));
+       /*
+        * 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))) {
+               pg_error_badrequest(
+                   "You specified an invalid manpath.");
+               return;
+       }
+
+       search.arch = req->q.arch;
+       search.sec = req->q.sec;
+       search.deftype = req->q.equal ? TYPE_Nm : (TYPE_Nm | TYPE_Nd);
+       search.flags = req->q.equal ? MANSEARCH_MAN : 0;
 
-       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;
+       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++;
@@ -546,109 +861,112 @@ 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.
-        */
-
-       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)
-               resp_baddb();
-       else if (-1 == rc)
-               resp_badexpr(req);
+       if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz))
+               pg_noresult(req, "You entered an invalid query.");
+       else if (0 == ressz)
+               pg_noresult(req, "No results found.");
+       else
+               pg_searchres(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
 main(void)
 {
-       int              i;
        struct req       req;
-       char            *p, *path, *subpath;
-       struct manpaths  paths;
-
-       /* HTTP init: read and parse the query string. */
-
-       progname = getenv("SCRIPT_NAME");
-       if (NULL == progname)
-               progname = "";
+       const char      *path;
+       char            *querystring;
+       int              i;
 
-       host = getenv("HTTP_HOST");
-       if (NULL == host)
-               host = "localhost";
+       /* Scan our run-time environment. */
 
-       memset(&req, 0, sizeof(struct req));
+       if (NULL == (scriptname = getenv("SCRIPT_NAME")))
+               scriptname = "";
 
-       if (NULL != (p = getenv("QUERY_STRING")))
-               kval_parse(&req.fields, &req.fieldsz, p);
+       if (NULL == (httphost = getenv("HTTP_HOST")))
+               httphost = "localhost";
 
-       /* Resolve leading subpath component. */
+       /*
+        * First we change directory into the MAN_DIR so that
+        * subsequent scanning for manpath directories is rooted
+        * relative to the same position.
+        */
 
-       subpath = path = NULL;
-       req.page = PAGE__MAX;
+       if (-1 == chdir(MAN_DIR)) {
+               fprintf(stderr, "MAN_DIR: %s: %s\n",
+                   MAN_DIR, strerror(errno));
+               pg_error_internal();
+               return(EXIT_FAILURE);
+       } 
 
-       if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path)
-               req.page = PAGE_INDEX;
+       memset(&req, 0, sizeof(struct req));
+       pathgen(&req);
 
-       if (NULL != path && '/' == *path && '\0' == *++path)
-               req.page = PAGE_INDEX;
+       /* Next parse out the query string. */
 
-       /* Strip file suffix. */
+       if (NULL != (querystring = getenv("QUERY_STRING")))
+               http_parse(&req, querystring);
 
-       if (NULL != path && NULL != (p = strrchr(path, '.')))
-               if (NULL != p && NULL == strchr(p, '/'))
-                       *p++ = '\0';
+       /* Dispatch to the three different pages. */
 
-       /* Resolve subpath component. */
+       path = getenv("PATH_INFO");
+       if (NULL == path)
+               path = "";
+       else if ('/' == *path)
+               path++;
 
-       if (NULL != path && NULL != (subpath = strchr(path, '/')))
-               *subpath++ = '\0';
+       if ('\0' != *path)
+               pg_show(&req, path);
+       else if (NULL != req.q.expr)
+               pg_search(&req);
+       else
+               pg_index(&req);
 
-       /* Map path into one we recognise. */
+       for (i = 0; i < (int)req.psz; i++)
+               free(req.p[i]);
+       free(req.p);
+       return(EXIT_SUCCESS);
+}
 
-       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;
-                       }
+static int
+cmp(const void *p1, const void *p2)
+{
 
-       /* Initialise MANPATH. */
+       return(strcasecmp(((const struct manpage *)p1)->names,
+           ((const struct manpage *)p2)->names));
+}
 
-       memset(&paths, 0, sizeof(struct manpaths));
-       manpath_parse(&paths, NULL, NULL);
+/*
+ * Scan for indexable paths.
+ */
+static void
+pathgen(struct req *req)
+{
+       FILE    *fp;
+       char    *dp;
+       size_t   dpsz;
 
-       /* Route pages. */
+       if (NULL == (fp = fopen("manpath.conf", "r")))
+               return;
 
-       switch (req.page) {
-       case (PAGE_INDEX):
-               pg_index(&paths, &req, subpath);
-               break;
-       case (PAGE_SEARCH):
-               pg_search(&paths, &req, subpath);
-               break;
-       case (PAGE_SHOW):
-               pg_show(&paths, &req, subpath);
-               break;
-       default:
-               break;
+       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);
        }
-
-       manpath_free(&paths);
-       kval_free(req.fields, req.fieldsz);
-
-       return(EXIT_SUCCESS);
 }