Support .RE with an argument; needed for audio/pms(1).

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 284e4883634ad693a5a7fcb5c771a24fe9d838e6..546103e4fcd60f7f859467f058603bc66a6d189c 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.61 2014/07/10 00:52:50 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.103 2015/01/15 04:26:39 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>


@@ -15,14 +15,16 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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"
 #include "config.h"

-#endif
+
+#include <sys/types.h>
+#include <sys/time.h>

 
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

+#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -33,70 +35,88 @@
 #include "main.h"
 #include "manpath.h"
 #include "mansearch.h"
 #include "main.h"
 #include "manpath.h"
 #include "mansearch.h"

-
-enum   page {
-       PAGE_INDEX,
-       PAGE_SEARCH,
-       PAGE_SHOW,
-       PAGE__MAX
-};
+#include "cgi.h"

 
 /*
  * A query as passed to the search function.
  */
 struct query {
 
 /*
  * 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 */
+       char            *manpath; /* desired manual directory */
+       char            *arch; /* architecture */
+       char            *sec; /* manual section */
+       char            *query; /* unparsed query expression */
+       int              equal; /* match whole names, not substrings */

 };
 
 struct req {
        struct query      q;
        char            **p; /* array of available manpaths */
        size_t            psz; /* number of available manpaths */
 };
 
 struct req {
        struct query      q;
        char            **p; /* array of available manpaths */
        size_t            psz; /* number of available manpaths */

-       enum page         page;

 };
 
 static void             catman(const struct req *, const char *);
 };
 
 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             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             html_putchar(char);
 static int              http_decode(char *);

-static void             http_parse(struct req *, char *);
+static void             http_parse(struct req *, const char *);

 static void             http_print(const char *);
 static void             http_putchar(char);
 static void             http_print(const char *);
 static void             http_putchar(char);

-static void             http_printquery(const struct req *);
+static void             http_printquery(const struct req *, const char *);

 static void             pathgen(struct req *);
 static void             pathgen(struct req *);

-static void             pg_index(const struct req *, char *);
-static void             pg_search(const struct req *, char *);
-static void             pg_show(const struct req *, char *);
+static void             pg_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(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_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 void             resp_searchform(const struct req *);

+static void             resp_show(const struct req *, const char *);
+static void             set_query_attr(char **, char **);
+static int              validate_filename(const char *);
+static int              validate_manpath(const struct req *, const char *);
+static int              validate_urifrag(const char *);

 
 static const char       *scriptname; /* CGI script name */
 
 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 */
-       "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 - Library Functions",
+    "3p - Perl Library",
+    "4 - Device Drivers",
+    "5 - File Formats",
+    "6 - Games",
+    "7 - Miscellaneous Information",
+    "8 - System Manager\'s Manual",
+    "9 - Kernel Developer\'s Manual"
+};
+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 *);

 
 /*
  * Print a character, escaping HTML along the way.
 
 /*
  * Print a character, escaping HTML along the way.


@@ -126,46 +146,26 @@ html_putchar(char c)
 }
 
 static void
 }
 
 static void

-http_printquery(const struct req *req)
+http_printquery(const struct req *req, const char *sep)

 {
 
 {
 

-       if (NULL != req->q.manpath) {
-               printf("&manpath=");
-               http_print(req->q.manpath);
+       if (NULL != req->q.query) {
+               printf("query=");
+               http_print(req->q.query);

        }
        }

+       if (0 == req->q.equal)
+               printf("%sapropos=1", sep);

        if (NULL != req->q.sec) {
        if (NULL != req->q.sec) {

-               printf("&sec=");
+               printf("%ssec=", sep);

                http_print(req->q.sec);
        }
        if (NULL != req->q.arch) {
                http_print(req->q.sec);
        }
        if (NULL != req->q.arch) {

-               printf("&arch=");
+               printf("%sarch=", sep);

                http_print(req->q.arch);
        }
                http_print(req->q.arch);
        }

-       if (NULL != req->q.expr) {
-               printf("&expr=");
-               http_print(req->q.expr ? req->q.expr : "");
-       }
-}
-
-static void
-html_printquery(const struct req *req)
-{
-
-       if (NULL != req->q.manpath) {
-               printf("&amp;manpath=");
-               html_print(req->q.manpath);
-       }
-       if (NULL != req->q.sec) {
-               printf("&amp;sec=");
-               html_print(req->q.sec);
-       }
-       if (NULL != req->q.arch) {
-               printf("&amp;arch=");
-               html_print(req->q.arch);
-       }
-       if (NULL != req->q.expr) {
-               printf("&amp;expr=");
-               html_print(req->q.expr ? req->q.expr : "");
+       if (strcmp(req->q.manpath, req->p[0])) {
+               printf("%smanpath=", sep);
+               http_print(req->q.manpath);

        }
 }
 
        }
 }
 


@@ -194,71 +194,109 @@ html_print(const char *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.
+ * Transfer the responsibility for the allocated string *val
+ * to the query structure.

  */
 static void
  */
 static void

-http_parse(struct req *req, char *p)
+set_query_attr(char **attr, char **val)

 {
 {

-       char            *key, *val;
-       int              legacy;

 
 

-       memset(&req->q, 0, sizeof(struct query));
-       req->q.manpath = req->p[0];
+       free(*attr);
+       if (**val == '\0') {
+               *attr = NULL;
+               free(*val);
+       } else
+               *attr = *val;
+       *val = NULL;
+}

 
 

-       legacy = -1;
-       while ('\0' != *p) {
-               key = p;
-               val = NULL;
+/*
+ * Parse the QUERY_STRING for key-value pairs
+ * and store the values into the query structure.
+ */
+static void
+http_parse(struct req *req, const char *qs)
+{
+       char            *key, *val;
+       size_t           keysz, valsz;

 
 

-               p += (int)strcspn(p, ";&");
-               if ('\0' != *p)
-                       *p++ = '\0';
-               if (NULL != (val = strchr(key, '=')))
-                       *val++ = '\0';
+       req->q.manpath  = NULL;
+       req->q.arch     = NULL;
+       req->q.sec      = NULL;
+       req->q.query    = NULL;
+       req->q.equal    = 1;

 
 

-               if ('\0' == *key || NULL == val || '\0' == *val)
-                       continue;
+       key = val = NULL;
+       while (*qs != '\0') {

 
 

-               /* Just abort handling. */
+               /* Parse one key. */

 
 

-               if ( ! http_decode(key))
-                       break;
-               if (NULL != val && ! http_decode(val))
-                       break;
+               keysz = strcspn(qs, "=;&");
+               key = mandoc_strndup(qs, keysz);
+               qs += keysz;
+               if (*qs != '=')
+                       goto next;

 
 

-               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;
-
-       /* 
-        * Section "0" means no section when in legacy mode.
-        * For some man.cgi scripts, "default" arch is none.
-        */
+               /* Parse one value. */
+
+               valsz = strcspn(++qs, ";&");
+               val = mandoc_strndup(qs, valsz);
+               qs += valsz;
+
+               /* Decode and catch encoding errors. */
+
+               if ( ! (http_decode(key) && http_decode(val)))
+                       goto next;
+
+               /* Handle key-value pairs. */
+
+               if ( ! strcmp(key, "query"))
+                       set_query_attr(&req->q.query, &val);
+
+               else if ( ! strcmp(key, "apropos"))
+                       req->q.equal = !strcmp(val, "0");
+
+               else if ( ! strcmp(key, "manpath")) {
+#ifdef COMPAT_OLDURI
+                       if ( ! strncmp(val, "OpenBSD ", 8)) {
+                               val[7] = '-';
+                               if ('C' == val[8])
+                                       val[8] = 'c';
+                       }
+#endif
+                       set_query_attr(&req->q.manpath, &val);
+               }

 
 

-       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;
+               else if ( ! (strcmp(key, "sec")
+#ifdef COMPAT_OLDURI
+                   && strcmp(key, "sektion")
+#endif
+                   )) {
+                       if ( ! strcmp(val, "0"))
+                               *val = '\0';
+                       set_query_attr(&req->q.sec, &val);
+               }
+
+               else if ( ! strcmp(key, "arch")) {
+                       if ( ! strcmp(val, "default"))
+                               *val = '\0';
+                       set_query_attr(&req->q.arch, &val);
+               }
+
+               /*
+                * The key must be freed in any case.
+                * The val may have been handed over to the query
+                * structure, in which case it is now NULL.
+                */
+next:
+               free(key);
+               key = NULL;
+               free(val);
+               val = NULL;
+
+               if (*qs != '\0')
+                       qs++;
+       }

 }
 
 static void
 }
 
 static void


@@ -284,11 +322,13 @@ static int
 http_decode(char *p)
 {
        char             hex[3];
 http_decode(char *p)
 {
        char             hex[3];

+       char            *q;

        int              c;
 
        hex[2] = '\0';
 
        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);
                if ('%' == *p) {
                        if ('\0' == (hex[0] = *(p + 1)))
                                return(0);


@@ -299,13 +339,13 @@ http_decode(char *p)
                        if ('\0' == c)
                                return(0);
 
                        if ('\0' == c)
                                return(0);
 

-                       *p = (char)c;
-                       memmove(p + 1, p + 3, strlen(p + 3) + 1);
+                       *q = (char)c;
+                       p += 2;

                } else
                } else

-                       *p = '+' == *p ? ' ' : *p;
+                       *q = '+' == *p ? ' ' : *p;

        }
 
        }
 

-       *p = '\0';
+       *q = '\0';

        return(1);
 }
 
        return(1);
 }
 


@@ -314,12 +354,12 @@ resp_begin_http(int code, const char *msg)
 {
 
        if (200 != code)
 {
 
        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);
 }
 
        fflush(stdout);
 }


@@ -330,22 +370,19 @@ resp_begin_html(int code, const char *msg)
 
        resp_begin_http(code, 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"
+       printf("<!DOCTYPE html>\n"

               "<HTML>\n"
               "<HEAD>\n"
               "<HTML>\n"
               "<HEAD>\n"

-              "<META HTTP-EQUIV=\"Content-Type\""
-              " CONTENT=\"text/html; charset=utf-8\">\n"
+              "<META 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"
               "<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"
+              "<TITLE>%s</TITLE>\n"

               "</HEAD>\n"
               "<BODY>\n"
               "<!-- Begin page content. //-->\n",
               "</HEAD>\n"
               "<BODY>\n"
               "<!-- Begin page content. //-->\n",

-              cssdir, cssdir);
+              CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE);

 }
 
 static void
 }
 
 static void


@@ -361,31 +398,72 @@ resp_searchform(const struct req *req)
 {
        int              i;
 
 {
        int              i;
 

+       puts(CUSTOMIZE_BEGIN);

        puts("<!-- Begin search form. //-->");
        printf("<DIV ID=\"mancgi\">\n"
        puts("<!-- Begin search form. //-->");
        printf("<DIV ID=\"mancgi\">\n"

-              "<FORM ACTION=\"%s/search\" METHOD=\"get\">\n"
+              "<FORM ACTION=\"%s\" METHOD=\"get\">\n"

               "<FIELDSET>\n"
               "<FIELDSET>\n"

-              "<LEGEND>Search Parameters</LEGEND>\n"
-              "<INPUT TYPE=\"submit\" "
-              " VALUE=\"Search\"> for manuals matching \n"
-              "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"",
+              "<LEGEND>Manual Page Search Parameters</LEGEND>\n",

               scriptname);
               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("\">");
+
+       /* Write query input box. */
+
+       printf( "<TABLE><TR><TD>\n"
+               "<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\"");
+       if (NULL != req->q.query)
+               html_print(req->q.query);
+       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=\"checked\" ");
+       printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n"
+               "<LABEL FOR=\"show\">Show named manual page</LABEL>\n");
+
+       /* Write section selector. */
+
+       puts(   "</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=\"selected\"");
+               printf(">%s</OPTION>\n", sec_names[i]);
+       }
+       puts("</SELECT>");
+
+       /* Write architecture selector. */
+
+       printf( "<SELECT NAME=\"arch\">\n"
+               "<OPTION VALUE=\"default\"");
+       if (NULL == req->q.arch)
+               printf(" SELECTED=\"selected\"");
+       puts(">All Architectures</OPTION>");
+       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=\"selected\"");
+               printf(">%s</OPTION>\n", arch_names[i]);
+       }
+       puts("</SELECT>");
+
+       /* Write manpath selector. */
+

        if (req->psz > 1) {
        if (req->psz > 1) {

-               puts(", in <SELECT NAME=\"manpath\">");
+               puts("<SELECT NAME=\"manpath\">");

                for (i = 0; i < (int)req->psz; i++) {
                        printf("<OPTION ");
                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]))
+                       if (strcmp(req->q.manpath, req->p[i]) == 0)

                                printf("SELECTED=\"selected\" ");
                        printf("VALUE=\"");
                        html_print(req->p[i]);
                                printf("SELECTED=\"selected\" ");
                        printf("VALUE=\"");
                        html_print(req->p[i]);


@@ -395,36 +473,82 @@ resp_searchform(const struct req *req)
                }
                puts("</SELECT>");
        }
                }
                puts("</SELECT>");
        }

-       puts("&mdash;\n"
-            "<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n"
+
+       /* Write search radio button */
+
+       printf( "</TD><TD>\n"
+               "<INPUT TYPE=\"radio\" ");
+       if (0 == req->q.equal)
+               printf("CHECKED=\"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. //-->");
 }
 
             "</FIELDSET>\n"
             "</FORM>\n"
             "</DIV>");
        puts("<!-- End search form. //-->");
 }
 

+static int
+validate_urifrag(const char *frag)
+{
+
+       while ('\0' != *frag) {
+               if ( ! (isalnum((unsigned char)*frag) ||
+                   '-' == *frag || '.' == *frag ||
+                   '/' == *frag || '_' == *frag))
+                       return(0);
+               frag++;
+       }
+       return(1);
+}
+
+static int
+validate_manpath(const struct req *req, const char* manpath)
+{
+       size_t   i;
+
+       if ( ! strcmp(manpath, "mandoc"))
+               return(1);
+
+       for (i = 0; i < req->psz; i++)
+               if ( ! strcmp(manpath, req->p[i]))
+                       return(1);
+
+       return(0);
+}
+
+static int
+validate_filename(const char *file)
+{
+
+       if ('.' == file[0] && '/' == file[1])
+               file += 2;
+
+       return ( ! (strstr(file, "../") || strstr(file, "/..") ||
+           (strncmp(file, "man", 3) && strncmp(file, "cat", 3))));
+}
+

 static void
 static void

-resp_index(const struct req *req)
+pg_index(const struct req *req)

 {
 
        resp_begin_html(200, NULL);
 {
 
        resp_begin_html(200, NULL);

-       puts("<H1>\n"
-            "Online manuals with "
-            "<A HREF=\"http://mdocml.bsd.lv/\">mandoc</A>\n"
-            "</H1>");

        resp_searchform(req);
        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>");
+       printf("<P>\n"
+              "This web interface is documented in the\n"
+              "<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A>\n"
+              "manual, and the\n"
+              "<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A>\n"
+              "manual explains the query syntax.\n"
+              "</P>\n",
+              scriptname, scriptname);

        resp_end_html();
 }
 
 static void
        resp_end_html();
 }
 
 static void

-resp_noresult(const struct req *req, const char *msg)
+pg_noresult(const struct req *req, const char *msg)

 {
        resp_begin_html(200, NULL);
        resp_searchform(req);
 {
        resp_begin_html(200, NULL);
        resp_searchform(req);


@@ -435,7 +559,7 @@ resp_noresult(const struct req *req, const char *msg)
 }
 
 static void
 }
 
 static void

-resp_error_badrequest(const char *msg)
+pg_error_badrequest(const char *msg)

 {
 
        resp_begin_html(400, "Bad Request");
 {
 
        resp_begin_html(400, "Bad Request");


@@ -449,25 +573,7 @@ resp_error_badrequest(const char *msg)
 }
 
 static void
 }
 
 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)
+pg_error_internal(void)

 {
        resp_begin_html(500, "Internal Server Error");
        puts("<P>Internal Server Error</P>");
 {
        resp_begin_html(500, "Internal Server Error");
        puts("<P>Internal Server Error</P>");


@@ -475,26 +581,38 @@ resp_error_internal(void)
 }
 
 static void
 }
 
 static void

-resp_search(const struct req *req, struct manpage *r, size_t sz)
+pg_searchres(const struct req *req, struct manpage *r, size_t sz)

 {
 {

-       size_t           i;
+       char            *arch, *archend;
+       size_t           i, iuse, isec;
+       int              archprio, archpriouse;
+       int              prio, priouse;
+       char             sec;
+
+       for (i = 0; i < sz; i++) {
+               if (validate_filename(r[i].file))
+                       continue;
+               fprintf(stderr, "invalid filename %s in %s database\n",
+                   r[i].file, req->q.manpath);
+               pg_error_internal();
+               return;
+       }

 
        if (1 == sz) {
                /*
                 * If we have just one result, then jump there now
                 * without any delay.
                 */
 
        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");
+               printf("Status: 303 See Other\r\n");
+               printf("Location: http://%s%s/%s/%s?",
+                   HTTP_HOST, 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;
        }
 
                return;
        }
 

-       qsort(r, sz, sizeof(struct manpage), cmp);
-

        resp_begin_html(200, NULL);
        resp_searchform(req);
        puts("<DIV CLASS=\"results\">");
        resp_begin_html(200, NULL);
        resp_searchform(req);
        puts("<DIV CLASS=\"results\">");


@@ -503,9 +621,9 @@ resp_search(const struct req *req, struct manpage *r, size_t sz)
        for (i = 0; i < sz; i++) {
                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"
        for (i = 0; i < sz; i++) {
                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"

-                      "<A HREF=\"%s/show/%s/%s?", 
+                      "<A HREF=\"%s/%s/%s?", 

                    scriptname, req->q.manpath, r[i].file);
                    scriptname, req->q.manpath, r[i].file);

-               html_printquery(req);
+               http_printquery(req, "&amp;");

                printf("\">");
                html_print(r[i].names);
                printf("</A>\n"
                printf("\">");
                html_print(r[i].names);
                printf("</A>\n"


@@ -518,15 +636,49 @@ resp_search(const struct req *req, struct manpage *r, size_t sz)
 
        puts("</TABLE>\n"
             "</DIV>");
 
        puts("</TABLE>\n"
             "</DIV>");

-       resp_end_html();
-}

 
 

-/* ARGSUSED */
-static void
-pg_index(const struct req *req, char *path)
-{
+       /*
+        * In man(1) mode, show one of the pages
+        * even if more than one is found.
+        */

 
 

-       resp_index(req);
+       if (req->q.equal) {
+               puts("<HR>");
+               iuse = 0;
+               priouse = 10;
+               archpriouse = 3;
+               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 (NULL == req->q.arch) {
+                               archprio =
+                                   (NULL == (arch = strchr(
+                                       r[i].file + isec, '/'))) ? 3 :
+                                   (NULL == (archend = strchr(
+                                       arch + 1, '/'))) ? 0 :
+                                   strncmp(arch, "amd64/",
+                                       archend - arch) ? 2 : 1;
+                               if (archprio < archpriouse) {
+                                       archpriouse = archprio;
+                                       priouse = prio;
+                                       iuse = i;
+                                       continue;
+                               }
+                               if (archprio > archpriouse)
+                                       continue;
+                       }
+                       if (prio >= priouse)
+                               continue;
+                       priouse = prio;
+                       iuse = i;
+               }
+               resp_show(req, r[iuse].file);
+       }
+
+       resp_end_html();

 }
 
 static void
 }
 
 static void


@@ -539,13 +691,10 @@ catman(const struct req *req, const char *file)
        int              italic, bold;
 
        if (NULL == (f = fopen(file, "r"))) {
        int              italic, bold;
 
        if (NULL == (f = fopen(file, "r"))) {

-               resp_error_badrequest(
-                   "You specified an invalid manual file.");
+               puts("<P>You specified an invalid manual file.</P>");

                return;
        }
 
                return;
        }
 

-       resp_begin_html(200, NULL);
-       resp_searchform(req);

        puts("<DIV CLASS=\"catman\">\n"
             "<PRE>");
 
        puts("<DIV CLASS=\"catman\">\n"
             "<PRE>");
 


@@ -659,9 +808,7 @@ catman(const struct req *req, const char *file)
        }
 
        puts("</PRE>\n"
        }
 
        puts("</PRE>\n"

-            "</DIV>\n"
-            "</BODY>\n"
-            "</HTML>");
+            "</DIV>");

 
        fclose(f);
 }
 
        fclose(f);
 }


@@ -670,72 +817,90 @@ static void
 format(const struct req *req, const char *file)
 {
        struct mparse   *mp;
 format(const struct req *req, const char *file)
 {
        struct mparse   *mp;

-       int              fd;
+       struct mchars   *mchars;

        struct mdoc     *mdoc;
        struct man      *man;
        void            *vp;
        struct mdoc     *mdoc;
        struct man      *man;
        void            *vp;

-       enum mandoclevel rc;
-       char             opts[PATH_MAX + 128];
+       char            *opts;
+       int              fd;
+       int              usepath;

 
        if (-1 == (fd = open(file, O_RDONLY, 0))) {
 
        if (-1 == (fd = open(file, O_RDONLY, 0))) {

-               resp_error_badrequest(
-                   "You specified an invalid manual file.");
+               puts("<P>You specified an invalid manual file.</P>");

                return;
        }
 
                return;
        }
 

-       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
-           req->q.manpath);
-       rc = mparse_readfd(mp, fd, file);
+       mchars = mchars_alloc();
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL,
+           mchars, req->q.manpath);
+       mparse_readfd(mp, fd, file);

        close(fd);
 
        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);
+       usepath = strcmp(req->q.manpath, req->p[0]);
+       mandoc_asprintf(&opts,
+           "fragment,man=%s?query=%%N&sec=%%S%s%s%s%s",
+           scriptname,
+           req->q.arch ? "&arch="       : "",
+           req->q.arch ? req->q.arch    : "",
+           usepath     ? "&manpath="    : "",
+           usepath     ? req->q.manpath : "");

 
        mparse_result(mp, &mdoc, &man, NULL);
        if (NULL == man && NULL == mdoc) {
                fprintf(stderr, "fatal mandoc error: %s/%s\n",
                    req->q.manpath, file);
 
        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();
+               pg_error_internal();

                mparse_free(mp);
                mparse_free(mp);

+               mchars_free(mchars);

                return;
        }
 
                return;
        }
 

-       resp_begin_html(200, NULL);
-       resp_searchform(req);
-
-       vp = html_alloc(opts);
+       vp = html_alloc(mchars, opts);

 
        if (NULL != mdoc)
                html_mdoc(vp, mdoc);
        else
                html_man(vp, man);
 
 
        if (NULL != mdoc)
                html_mdoc(vp, mdoc);
        else
                html_man(vp, man);
 

-       puts("</BODY>\n"
-            "</HTML>");
-

        html_free(vp);
        mparse_free(mp);
        html_free(vp);
        mparse_free(mp);

+       mchars_free(mchars);
+       free(opts);

 }
 
 static void
 }
 
 static void

-pg_show(const struct req *req, char *path)
+resp_show(const struct req *req, const char *file)

 {
 {

-       char            *sub;

 
 

-       if (NULL == path || NULL == (sub = strchr(path, '/'))) {
-               resp_error_badrequest(
+       if ('.' == file[0] && '/' == file[1])
+               file += 2;
+
+       if ('c' == *file)
+               catman(req, file);
+       else
+               format(req, file);
+}
+
+static void
+pg_show(struct req *req, const char *fullpath)
+{
+       char            *manpath;
+       const char      *file;
+
+       if ((file = strchr(fullpath, '/')) == NULL) {
+               pg_error_badrequest(

                    "You did not specify a page to show.");
                return;
        } 
                    "You did not specify a page to show.");
                return;
        } 

-       *sub++ = '\0';
+       manpath = mandoc_strndup(fullpath, file - fullpath);
+       file++;
+
+       if ( ! validate_manpath(req, manpath)) {
+               pg_error_badrequest(
+                   "You specified an invalid manpath.");
+               free(manpath);
+               return;
+       }

 
        /*
         * Begin by chdir()ing into the manpath.
 
        /*
         * Begin by chdir()ing into the manpath.


@@ -743,28 +908,42 @@ pg_show(const struct req *req, char *path)
         * relative to the manpath root.
         */
 
         * relative to the manpath root.
         */
 

-       if (-1 == chdir(path)) {
-               resp_error_badrequest(
-                   "You specified an invalid manpath.");
+       if (chdir(manpath) == -1) {
+               fprintf(stderr, "chdir %s: %s\n",
+                   manpath, strerror(errno));
+               pg_error_internal();
+               free(manpath);

                return;
        }
 
                return;
        }
 

-       if ('c' == *sub)
-               catman(req, sub);
-       else
-               format(req, sub);
+       if (strcmp(manpath, "mandoc")) {
+               free(req->q.manpath);
+               req->q.manpath = manpath;
+       } else
+               free(manpath);
+
+       if ( ! validate_filename(file)) {
+               pg_error_badrequest(
+                   "You specified an invalid manual file.");
+               return;
+       }
+
+       resp_begin_html(200, NULL);
+       resp_searchform(req);
+       resp_show(req, file);
+       resp_end_html();

 }
 
 static void
 }
 
 static void

-pg_search(const struct req *req, char *path)
+pg_search(const struct req *req)

 {
        struct mansearch          search;
        struct manpaths           paths;
        struct manpage           *res;
 {
        struct mansearch          search;
        struct manpaths           paths;
        struct manpage           *res;

-       char                    **cp;
-       const char               *ep, *start;
+       char                    **argv;
+       char                     *query, *rp, *wp;

        size_t                    ressz;
        size_t                    ressz;

-       int                       i, sz;
+       int                       argc;

 
        /*
         * Begin by chdir()ing into the root of the manpath.
 
        /*
         * Begin by chdir()ing into the root of the manpath.


@@ -773,61 +952,62 @@ pg_search(const struct req *req, char *path)
         */
 
        if (-1 == (chdir(req->q.manpath))) {
         */
 
        if (-1 == (chdir(req->q.manpath))) {

-               resp_error_badrequest(
-                   "You specified an invalid manpath.");
+               fprintf(stderr, "chdir %s: %s\n",
+                   req->q.manpath, strerror(errno));
+               pg_error_internal();

                return;
        }
 
        search.arch = req->q.arch;
        search.sec = req->q.sec;
                return;
        }
 
        search.arch = req->q.arch;
        search.sec = req->q.sec;

-       search.deftype = TYPE_Nm | TYPE_Nd;
-       search.flags = 0;
+       search.outkey = "Nd";
+       search.argmode = req->q.equal ? ARG_NAME : ARG_EXPR;
+       search.firstmatch = 1;

 
        paths.sz = 1;
        paths.paths = mandoc_malloc(sizeof(char *));
        paths.paths[0] = mandoc_strdup(".");
 
        /*
 
        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.
+        * Break apart at spaces with backslash-escaping.

         */
 
         */
 

-       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.");
+       argc = 0;
+       argv = NULL;
+       rp = query = mandoc_strdup(req->q.query);
+       for (;;) {
+               while (isspace((unsigned char)*rp))
+                       rp++;
+               if (*rp == '\0')
+                       break;
+               argv = mandoc_reallocarray(argv, argc + 1, sizeof(char *));
+               argv[argc++] = wp = rp;
+               for (;;) {
+                       if (isspace((unsigned char)*rp)) {
+                               *wp = '\0';
+                               rp++;
+                               break;
+                       }
+                       if (rp[0] == '\\' && rp[1] != '\0')
+                               rp++;
+                       if (wp != rp)
+                               *wp = *rp;
+                       if (*rp == '\0')
+                               break;
+                       wp++;
+                       rp++;
+               }
+       }
+
+       if (0 == mansearch(&search, &paths, argc, argv, &res, &ressz))
+               pg_noresult(req, "You entered an invalid query.");

        else if (0 == ressz)
        else if (0 == ressz)

-               resp_noresult(req, "No results found.");
+               pg_noresult(req, "No results found.");

        else
        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);
+               pg_searchres(req, res, ressz);

 
 

+       free(query);
+       mansearch_free(res, ressz);

        free(paths.paths[0]);
        free(paths.paths);
 }
        free(paths.paths[0]);
        free(paths.paths);
 }


@@ -835,34 +1015,46 @@ pg_search(const struct req *req, char *path)
 int
 main(void)
 {
 int
 main(void)
 {

-       int              i;

        struct req       req;
        struct req       req;

-       char            *querystring, *path, *subpath;
+       struct itimerval itimer;
+       const char      *path;
+       const char      *querystring;
+       int              i;

 
 

-       /* Scan our run-time environment. */
+       /* Poor man's ReDoS mitigation. */
+
+       itimer.it_value.tv_sec = 2;
+       itimer.it_value.tv_usec = 0;
+       itimer.it_interval.tv_sec = 2;
+       itimer.it_interval.tv_usec = 0;
+       if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) {
+               fprintf(stderr, "setitimer: %s\n", strerror(errno));
+               pg_error_internal();
+               return(EXIT_FAILURE);
+       }

 
 

-       if (NULL == (mandir = getenv("MAN_DIR")))
-               mandir = "/man";
+       /* Scan our run-time environment. */

 
        if (NULL == (scriptname = getenv("SCRIPT_NAME")))
                scriptname = "";
 
 
        if (NULL == (scriptname = getenv("SCRIPT_NAME")))
                scriptname = "";
 

-       if (NULL == (cssdir = getenv("CSS_DIR")))
-               cssdir = "";
-
-       if (NULL == (httphost = getenv("HTTP_HOST")))
-               httphost = "localhost";
+       if ( ! validate_urifrag(scriptname)) {
+               fprintf(stderr, "unsafe SCRIPT_NAME \"%s\"\n",
+                   scriptname);
+               pg_error_internal();
+               return(EXIT_FAILURE);
+       }

 
        /*
 
        /*

-        * First we change directory into the mandir so that
+        * First we change directory into the MAN_DIR so that

         * subsequent scanning for manpath directories is rooted
         * relative to the same position.
         */
 
         * subsequent scanning for manpath directories is rooted
         * relative to the same position.
         */
 

-       if (-1 == chdir(mandir)) {
+       if (-1 == chdir(MAN_DIR)) {

                fprintf(stderr, "MAN_DIR: %s: %s\n",
                fprintf(stderr, "MAN_DIR: %s: %s\n",

-                   mandir, strerror(errno));
-               resp_error_internal();
+                   MAN_DIR, strerror(errno));
+               pg_error_internal();

                return(EXIT_FAILURE);
        } 
 
                return(EXIT_FAILURE);
        } 
 


@@ -874,67 +1066,45 @@ main(void)
        if (NULL != (querystring = getenv("QUERY_STRING")))
                http_parse(&req, querystring);
 
        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;
-
-       if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path)
-               req.page = PAGE_INDEX;
-
-       if (NULL != path && '/' == *path && '\0' == *++path)
-               req.page = PAGE_INDEX;
-
-       /* Resolve subpath component. */
-
-       if (NULL != path && NULL != (subpath = strchr(path, '/')))
-               *subpath++ = '\0';
+       if (req.q.manpath == NULL)
+               req.q.manpath = mandoc_strdup(req.p[0]);
+       else if ( ! validate_manpath(&req, req.q.manpath)) {
+               pg_error_badrequest(
+                   "You specified an invalid manpath.");
+               return(EXIT_FAILURE);
+       }

 
 

-       /* Map path into one we recognise. */
+       if ( ! (NULL == req.q.arch || validate_urifrag(req.q.arch))) {
+               pg_error_badrequest(
+                   "You specified an invalid architecture.");
+               return(EXIT_FAILURE);
+       }

 
 

-       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;
-                       }
+       /* Dispatch to the three different pages. */

 
 

-       /* Route pages. */
+       path = getenv("PATH_INFO");
+       if (NULL == path)
+               path = "";
+       else if ('/' == *path)
+               path++;

 
 

-       switch (req.page) {
-       case (PAGE_INDEX):
-               pg_index(&req, subpath);
-               break;
-       case (PAGE_SEARCH):
-               pg_search(&req, subpath);
-               break;
-       case (PAGE_SHOW):
-               pg_show(&req, subpath);
-               break;
-       default:
-               resp_error_notfound(path);
-               break;
-       }
+       if ('\0' != *path)
+               pg_show(&req, path);
+       else if (NULL != req.q.query)
+               pg_search(&req);
+       else
+               pg_index(&req);

 
 

+       free(req.q.manpath);
+       free(req.q.arch);
+       free(req.q.sec);
+       free(req.q.query);

        for (i = 0; i < (int)req.psz; i++)
                free(req.p[i]);
        free(req.p);
        return(EXIT_SUCCESS);
 }
 
        for (i = 0; i < (int)req.psz; i++)
                free(req.p[i]);
        free(req.p);
        return(EXIT_SUCCESS);
 }
 

-static int
-cmp(const void *p1, const void *p2)
-{
-
-       return(strcasecmp(((const struct manpage *)p1)->names,
-           ((const struct manpage *)p2)->names));
-}
-

 /*
  * Scan for indexable paths.
  */
 /*
  * Scan for indexable paths.
  */


@@ -945,14 +1115,37 @@ pathgen(struct req *req)
        char    *dp;
        size_t   dpsz;
 
        char    *dp;
        size_t   dpsz;
 

-       if (NULL == (fp = fopen("manpath.conf", "r")))
-               return;
+       if (NULL == (fp = fopen("manpath.conf", "r"))) {
+               fprintf(stderr, "%s/manpath.conf: %s\n",
+                       MAN_DIR, strerror(errno));
+               pg_error_internal();
+               exit(EXIT_FAILURE);
+       }

 
        while (NULL != (dp = fgetln(fp, &dpsz))) {
                if ('\n' == dp[dpsz - 1])
                        dpsz--;
                req->p = mandoc_realloc(req->p,
                    (req->psz + 1) * sizeof(char *));
 
        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);
+               dp = mandoc_strndup(dp, dpsz);
+               if ( ! validate_urifrag(dp)) {
+                       fprintf(stderr, "%s/manpath.conf contains "
+                           "unsafe path \"%s\"\n", MAN_DIR, dp);
+                       pg_error_internal();
+                       exit(EXIT_FAILURE);
+               }
+               if (NULL != strchr(dp, '/')) {
+                       fprintf(stderr, "%s/manpath.conf contains "
+                           "path with slash \"%s\"\n", MAN_DIR, dp);
+                       pg_error_internal();
+                       exit(EXIT_FAILURE);
+               }
+               req->p[req->psz++] = dp;
+       }
+
+       if ( req->p == NULL ) {
+               fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR);
+               pg_error_internal();
+               exit(EXIT_FAILURE);

        }
 }
        }
 }