]> git.cameronkatri.com Git - mandoc.git/blobdiff - cgi.c
Link to the new man.cgi(8) manual, now that we have it! :-)
[mandoc.git] / cgi.c
diff --git a/cgi.c b/cgi.c
index a596254a4c8f882bcfccb31118f9b21129186612..284e4883634ad693a5a7fcb5c771a24fe9d838e6 100644 (file)
--- a/cgi.c
+++ b/cgi.c
-/*     $Id: cgi.c,v 1.2 2011/11/09 22:05:56 kristaps Exp $ */
-#include <assert.h>
+/*     $Id: cgi.c,v 1.61 2014/07/10 00:52:50 schwarze Exp $ */
+/*
+ * 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <fcntl.h>
-#include <regex.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 
-#include "apropos.h"
 #include "mandoc.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
+#include "main.h"
+#include "manpath.h"
+#include "mansearch.h"
 
 
-/*
- * The page a request is trying to make.
- */
 enum   page {
        PAGE_INDEX,
        PAGE_SEARCH,
 enum   page {
        PAGE_INDEX,
        PAGE_SEARCH,
+       PAGE_SHOW,
        PAGE__MAX
 };
 
 /*
        PAGE__MAX
 };
 
 /*
- * Key-value pair.  
- * Both key and val are on the heap.
- */
-struct kval {
-       char            *key;
-       char            *val;
-};
-
-/*
- * The media type, determined by suffix, of the requesting or responding
- * context.
+ * A query as passed to the search function.
  */
  */
-enum   media {
-       MEDIA_HTML,
-       MEDIA__MAX
+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 */
 };
 
 };
 
-/*
- * An HTTP request.
- */
 struct req {
 struct req {
-       struct kval     *fields; /* query fields */
-       size_t           fieldsz;
-       enum media       media;
-       enum page        page;
+       struct query      q;
+       char            **p; /* array of available manpaths */
+       size_t            psz; /* number of available manpaths */
+       enum page         page;
 };
 
 };
 
-#if 0
-static void             html_printtext(const char *);
-#endif
-static int              kval_decode(char *);
-static void             kval_parse(struct kval **, size_t *, char *);
-static void             kval_free(struct kval *, size_t);
+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 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_index(const struct req *, char *);
 static void             pg_search(const struct req *, char *);
-#if 0
-static void             pg_searchres(struct rec *, size_t, void *);
-#endif
+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_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       *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 */ 
        "search", /* PAGE_SEARCH */
 
 static const char * const pages[PAGE__MAX] = {
        "index", /* PAGE_INDEX */ 
        "search", /* PAGE_SEARCH */
+       "show", /* PAGE_SHOW */
 };
 
 };
 
-static const char * const medias[MEDIA__MAX] = {
-       "html", /* MEDIA_HTML */
-};
+/*
+ * Print a character, escaping HTML along the way.
+ * This will pass non-ASCII straight to output: be warned!
+ */
+static void
+html_putchar(char c)
+{
+
+       switch (c) {
+       case ('"'):
+               printf("&quote;");
+               break;
+       case ('&'):
+               printf("&amp;");
+               break;
+       case ('>'):
+               printf("&gt;");
+               break;
+       case ('<'):
+               printf("&lt;");
+               break;
+       default:
+               putchar((unsigned char)c);
+               break;
+       }
+}
 
 
-#if 0
 static void
 static void
-html_printtext(const char *p)
+http_printquery(const struct req *req)
 {
 {
-       char             c;
 
 
-       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("&expr=");
+               http_print(req->q.expr ? req->q.expr : "");
+       }
 }
 }
-#endif
 
 static void
 
 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);
+       }
+       if (NULL != req->q.expr) {
+               printf("&amp;expr=");
+               html_print(req->q.expr ? req->q.expr : "");
        }
        }
-       free(p);
+}
+
+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++);
 }
 
 /*
  * Parse out key-value pairs from an HTTP request variable.
 }
 
 /*
  * Parse out key-value pairs from an HTTP request variable.
- * This can be either a cookie or a POST/GET string.
+ * This can be either a cookie or a POST/GET string, although man.cgi
+ * uses only GET for simplicity.
  */
 static void
  */
 static void
-kval_parse(struct kval **kv, size_t *kvsz, char *p)
+http_parse(struct req *req, char *p)
 {
        char            *key, *val;
 {
        char            *key, *val;
-       size_t           sz, cur;
-
-       cur = 0;
+       int              legacy;
 
 
-       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;
 
                key = p;
                val = NULL;
 
-               if (NULL != (p = strchr(p, '='))) {
+               p += (int)strcspn(p, ";&");
+               if ('\0' != *p)
                        *p++ = '\0';
                        *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. */
 
                        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, "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");
+       }
+
+       /* Test for old man.cgi compatibility mode. */
+
+       req->q.legacy = legacy > 0;
 
 
-               (*kv)[(int)*kvsz].key = mandoc_strdup(key);
-               (*kv)[(int)*kvsz].val = mandoc_strdup(val);
-               (*kvsz)++;
+       /* 
+        * 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);
 }
 
 /*
 }
 
 /*
- * In-place HTTP-decode a string.  The standard explanation is that this
- * turns "%4e+foo" into "n foo" in the regular way.  This is done
- * in-place over the allocated string.
+ * HTTP-decode a string.  The standard explanation is that this turns
+ * "%4e+foo" into "n foo" in the regular way.  This is done in-place
+ * over the allocated string.
  */
 static int
  */
 static int
-kval_decode(char *p)
+http_decode(char *p)
 {
        char             hex[3];
        int              c;
 {
        char             hex[3];
        int              c;
@@ -203,51 +309,527 @@ kval_decode(char *p)
        return(1);
 }
 
        return(1);
 }
 
+static void
+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"
+            "");
+
+       fflush(stdout);
+}
+
+static void
+resp_begin_html(int code, const char *msg)
+{
+
+       resp_begin_http(code, msg);
+
+       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>");
+}
+
+static void
+resp_searchform(const struct req *req)
+{
+       int              i;
+
+       puts("<!-- Begin 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 matching \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(", in <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("&mdash;\n"
+            "<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n"
+            "</FIELDSET>\n"
+            "</FORM>\n"
+            "</DIV>");
+       puts("<!-- End search form. //-->");
+}
+
+static void
+resp_index(const struct req *req)
+{
+
+       resp_begin_html(200, NULL);
+       puts("<H1>\n"
+            "Online manuals with "
+            "<A HREF=\"http://mdocml.bsd.lv/\">mandoc</A>\n"
+            "</H1>");
+       resp_searchform(req);
+       puts("<P>\n"
+            "This web interface is documented in the "
+            "<A HREF=\"search?expr=Nm~^man\\.cgi$&amp;sec=8\">"
+            "man.cgi</A> manual, and the "
+            "<A HREF=\"search?expr=Nm~^apropos$&amp;sec=1\">"
+            "apropos</A> manual explains the query syntax.\n"
+            "</P>");
+       resp_end_html();
+}
+
+static void
+resp_noresult(const struct req *req, const char *msg)
+{
+       resp_begin_html(200, NULL);
+       resp_searchform(req);
+       puts("<P>");
+       puts(msg);
+       puts("</P>");
+       resp_end_html();
+}
+
+static void
+resp_error_badrequest(const char *msg)
+{
+
+       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_error_notfound(const char *page)
+{
+
+       resp_begin_html(404, "Not Found");
+       puts("<H1>Page Not Found</H1>\n"
+            "<P>\n"
+            "The page you're looking for, ");
+       printf("<B>");
+       html_print(page);
+       printf("</B>,\n"
+              "could not be found.\n"
+              "Try searching from the\n"
+              "<A HREF=\"%s\">main page</A>.\n"
+              "</P>", scriptname);
+       resp_end_html();
+}
+
+static void
+resp_error_internal(void)
+{
+       resp_begin_html(500, "Internal Server Error");
+       puts("<P>Internal Server Error</P>");
+       resp_end_html();
+}
+
+static void
+resp_search(const struct req *req, struct manpage *r, size_t sz)
+{
+       size_t           i;
+
+       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/%s/%s?",
+                   httphost, scriptname, req->q.manpath, r[0].file);
+               http_printquery(req);
+               puts("\n"
+                    "Content-Type: text/html; charset=utf-8\n");
+               return;
+       }
+
+       qsort(r, sz, sizeof(struct manpage), cmp);
+
+       resp_begin_html(200, NULL);
+       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/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 req *req, char *path)
 {
 
 
 /* ARGSUSED */
 static void
 pg_index(const struct req *req, char *path)
 {
 
+       resp_index(req);
 }
 
 }
 
-#if 0
 static void
 static void
-pg_searchres(struct rec *recs, size_t sz, void *arg)
+catman(const struct req *req, const char *file)
 {
 {
+       FILE            *f;
+       size_t           len;
        int              i;
        int              i;
-       const char      *pg;
-
-       if (NULL == (pg = getenv("SCRIPT_NAME")))
-               pg = "";
-
-       for (i = 0; i < (int)sz; i++) {
-               printf("<A HREF=\"%s/show/%u.html\">", 
-                               pg, recs[i].rec);
-               html_printtext(recs[i].title);
-               putchar('(');
-               html_printtext(recs[i].cat);
-               puts(")</A>");
+       char            *p;
+       int              italic, bold;
+
+       if (NULL == (f = fopen(file, "r"))) {
+               resp_error_badrequest(
+                   "You specified an invalid manual file.");
+               return;
        }
        }
+
+       resp_begin_html(200, NULL);
+       resp_searchform(req);
+       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>\n"
+            "</BODY>\n"
+            "</HTML>");
+
+       fclose(f);
 }
 }
-#endif
 
 static void
 
 static void
-pg_search(const struct req *req, char *path)
+format(const struct req *req, const char *file)
 {
 {
-       int              i;
-       struct opts      opt;
+       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))) {
+               resp_error_badrequest(
+                   "You specified an invalid manual file.");
+               return;
+       }
 
 
-       for (i = 0; i < (int)req->fieldsz; i++)
-               if (0 == strcmp(req->fields[i].key, "key"))
-                       break;
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
+           req->q.manpath);
+       rc = mparse_readfd(mp, fd, file);
+       close(fd);
+
+       if (rc >= MANDOCLEVEL_FATAL) {
+               fprintf(stderr, "fatal mandoc error: %s/%s\n",
+                   req->q.manpath, file);
+               resp_error_internal();
+               return;
+       }
+
+       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);
+
+       vp = html_alloc(opts);
+
+       if (NULL != mdoc)
+               html_mdoc(vp, mdoc);
+       else
+               html_man(vp, man);
+
+       puts("</BODY>\n"
+            "</HTML>");
+
+       html_free(vp);
+       mparse_free(mp);
+}
 
 
-       if (i == (int)req->fieldsz)
+static void
+pg_show(const struct req *req, char *path)
+{
+       char            *sub;
+
+       if (NULL == path || NULL == (sub = strchr(path, '/'))) {
+               resp_error_badrequest(
+                   "You did not specify a page to show.");
+               return;
+       } 
+       *sub++ = '\0';
+
+       /*
+        * Begin by chdir()ing into the manpath.
+        * This way we can pick up the database files, which are
+        * relative to the manpath root.
+        */
+
+       if (-1 == chdir(path)) {
+               resp_error_badrequest(
+                   "You specified an invalid manpath.");
                return;
                return;
+       }
 
 
-       memset(&opt, 0, sizeof(struct opts));
-       /*opt.types = TYPE_NAME | TYPE_DESC;
-       apropos_search(&opt, req->fields[i].val, NULL, pg_searchres);*/
+       if ('c' == *sub)
+               catman(req, sub);
+       else
+               format(req, sub);
+}
+
+static void
+pg_search(const struct req *req, char *path)
+{
+       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.
+        * 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_reallocarray(cp, sz + 1, sizeof(char *));
+               start = ep;
+               while ('\0' != *ep && ! isspace((unsigned char)*ep))
+                       ep++;
+               cp[sz] = mandoc_malloc((ep - start) + 1);
+               memcpy(cp[sz], start, ep - start);
+               cp[sz++][ep - start] = '\0';
+               while (isspace((unsigned char)*ep))
+                       ep++;
+       }
+
+       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);
+
+       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
 }
 
 int
@@ -255,37 +837,65 @@ main(void)
 {
        int              i;
        struct req       req;
 {
        int              i;
        struct req       req;
-       char            *p;
-       char            *path, *subpath, *suffix;
+       char            *querystring, *path, *subpath;
+
+       /* Scan our run-time environment. */
+
+       if (NULL == (mandir = getenv("MAN_DIR")))
+               mandir = "/man";
+
+       if (NULL == (scriptname = getenv("SCRIPT_NAME")))
+               scriptname = "";
+
+       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_error_internal();
+               return(EXIT_FAILURE);
+       } 
 
        memset(&req, 0, sizeof(struct req));
 
        memset(&req, 0, sizeof(struct req));
+       pathgen(&req);
+
+       /* Next parse out the query string. */
 
 
-       if (NULL != (p = getenv("QUERY_STRING")))
-               kval_parse(&req.fields, &req.fieldsz, p);
+       if (NULL != (querystring = getenv("QUERY_STRING")))
+               http_parse(&req, querystring);
 
 
-       suffix = subpath = path = NULL;
+       /*
+        * 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. 
+        */
 
 
-       req.media = MEDIA_HTML;
+       subpath = path = NULL;
        req.page = PAGE__MAX;
 
        if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path)
                req.page = PAGE_INDEX;
        req.page = PAGE__MAX;
 
        if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path)
                req.page = PAGE_INDEX;
+
        if (NULL != path && '/' == *path && '\0' == *++path)
                req.page = PAGE_INDEX;
 
        if (NULL != path && '/' == *path && '\0' == *++path)
                req.page = PAGE_INDEX;
 
-       if (NULL != path && NULL != (suffix = strrchr(path, '.')))
-               if (NULL != suffix && NULL == strchr(suffix, '/'))
-                       *suffix++ = '\0';
+       /* Resolve subpath component. */
 
        if (NULL != path && NULL != (subpath = strchr(path, '/')))
 
        if (NULL != path && NULL != (subpath = strchr(path, '/')))
-                       *subpath++ = '\0';
+               *subpath++ = '\0';
 
 
-       if (NULL != suffix && '\0' != *suffix)
-               for (i = 0; i < (int)MEDIA__MAX; i++)
-                       if (0 == strcmp(medias[i], suffix)) {
-                               req.media = (enum media)i;
-                               break;
-                       }
+       /* Map path into one we recognise. */
 
        if (NULL != path && '\0' != *path)
                for (i = 0; i < (int)PAGE__MAX; i++) 
 
        if (NULL != path && '\0' != *path)
                for (i = 0; i < (int)PAGE__MAX; i++) 
@@ -294,6 +904,8 @@ main(void)
                                break;
                        }
 
                                break;
                        }
 
+       /* Route pages. */
+
        switch (req.page) {
        case (PAGE_INDEX):
                pg_index(&req, subpath);
        switch (req.page) {
        case (PAGE_INDEX):
                pg_index(&req, subpath);
@@ -301,11 +913,46 @@ main(void)
        case (PAGE_SEARCH):
                pg_search(&req, subpath);
                break;
        case (PAGE_SEARCH):
                pg_search(&req, subpath);
                break;
+       case (PAGE_SHOW):
+               pg_show(&req, subpath);
+               break;
        default:
        default:
-               /* Blah */
+               resp_error_notfound(path);
                break;
        }
 
                break;
        }
 
-       kval_free(req.fields, req.fieldsz);
+       for (i = 0; i < (int)req.psz; i++)
+               free(req.p[i]);
+       free(req.p);
        return(EXIT_SUCCESS);
 }
        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);
+       }
+}