]> git.cameronkatri.com Git - mandoc.git/blobdiff - cgi.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix blunder in previous: we must keep the line parse buffer
[mandoc.git] / cgi.c
diff --git a/cgi.c b/cgi.c
index f6721c0b288327799b9d98a539fafcee3710604b..af56da2701e90c3f6fa34a50d527f2df1a45d6c8 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,7 +1,7 @@
-/*     $Id: cgi.c,v 1.128 2016/04/15 16:42:52 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.148 2017/02/22 16:20:01 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
+ * Copyright (c) 2014, 2015, 2016, 2017 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,7 +21,9 @@
 #include <sys/time.h>
 
 #include <ctype.h>
 #include <sys/time.h>
 
 #include <ctype.h>
+#if HAVE_ERR
 #include <err.h>
 #include <err.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -59,14 +61,17 @@ struct      req {
        int               isquery; /* QUERY_STRING used, not PATH_INFO */
 };
 
        int               isquery; /* QUERY_STRING used, not PATH_INFO */
 };
 
-static void             catman(const struct req *, const char *);
-static void             format(const struct req *, const char *);
+enum   focus {
+       FOCUS_NONE = 0,
+       FOCUS_QUERY
+};
+
 static void             html_print(const char *);
 static void             html_putchar(char);
 static int              http_decode(char *);
 static void             html_print(const char *);
 static void             html_putchar(char);
 static int              http_decode(char *);
-static void             http_parse(struct req *, const char *);
-static void             pathgen(struct req *);
-static void             path_parse(struct req *req, const char *path);
+static void             parse_manpath_conf(struct req *);
+static void             parse_path_info(struct req *req, const char *path);
+static void             parse_query_string(struct req *, const char *);
 static void             pg_error_badrequest(const char *);
 static void             pg_error_internal(void);
 static void             pg_index(const struct req *);
 static void             pg_error_badrequest(const char *);
 static void             pg_error_internal(void);
 static void             pg_index(const struct req *);
@@ -77,9 +82,11 @@ static       void             pg_searchres(const struct req *,
 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             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_catman(const struct req *, const char *);
 static void             resp_copy(const char *);
 static void             resp_end_html(void);
 static void             resp_copy(const char *);
 static void             resp_end_html(void);
-static void             resp_searchform(const struct req *);
+static void             resp_format(const struct req *, const char *);
+static void             resp_searchform(const struct req *, enum focus);
 static void             resp_show(const struct req *, const char *);
 static void             set_query_attr(char **, char **);
 static int              validate_filename(const char *);
 static void             resp_show(const struct req *, const char *);
 static void             set_query_attr(char **, char **);
 static int              validate_filename(const char *);
@@ -108,17 +115,18 @@ static    const char *const sec_names[] = {
 static const int sec_MAX = sizeof(sec_names) / sizeof(char *);
 
 static const char *const arch_names[] = {
 static const int sec_MAX = sizeof(sec_names) / sizeof(char *);
 
 static const char *const arch_names[] = {
-    "amd64",       "alpha",       "armish",      "armv7",
-    "hppa",        "hppa64",      "i386",        "landisk",
+    "amd64",       "alpha",       "armv7",     "arm64",
+    "hppa",        "i386",        "landisk",
     "loongson",    "luna88k",     "macppc",      "mips64",
     "loongson",    "luna88k",     "macppc",      "mips64",
-    "octeon",      "sgi",         "socppc",      "sparc",
-    "sparc64",     "zaurus",
-    "amiga",       "arc",         "arm32",       "atari",
-    "aviion",      "beagle",      "cats",        "hp300",       
+    "octeon",      "sgi",         "socppc",      "sparc64",
+    "amiga",       "arc",         "armish",      "arm32",
+    "atari",       "aviion",      "beagle",      "cats",
+    "hppa64",      "hp300",
     "ia64",        "mac68k",      "mvme68k",     "mvme88k",
     "mvmeppc",     "palm",        "pc532",       "pegasos",
     "ia64",        "mac68k",      "mvme68k",     "mvme88k",
     "mvmeppc",     "palm",        "pc532",       "pegasos",
-    "pmax",        "powerpc",     "solbourne",   "sun3",
-    "vax",         "wgrisc",      "x68k"
+    "pmax",        "powerpc",     "solbourne",   "sparc",
+    "sun3",        "vax",         "wgrisc",      "x68k",
+    "zaurus"
 };
 static const int arch_MAX = sizeof(arch_names) / sizeof(char *);
 
 };
 static const int arch_MAX = sizeof(arch_names) / sizeof(char *);
 
@@ -132,7 +140,7 @@ html_putchar(char c)
 
        switch (c) {
        case ('"'):
 
        switch (c) {
        case ('"'):
-               printf("&quote;");
+               printf("&quot;");
                break;
        case ('&'):
                printf("&amp;");
                break;
        case ('&'):
                printf("&amp;");
@@ -185,7 +193,7 @@ set_query_attr(char **attr, char **val)
  * and store the values into the query structure.
  */
 static void
  * and store the values into the query structure.
  */
 static void
-http_parse(struct req *req, const char *qs)
+parse_query_string(struct req *req, const char *qs)
 {
        char            *key, *val;
        size_t           keysz, valsz;
 {
        char            *key, *val;
        size_t           keysz, valsz;
@@ -332,6 +340,7 @@ resp_copy(const char *filename)
                fflush(stdout);
                while ((sz = read(fd, buf, sizeof(buf))) > 0)
                        write(STDOUT_FILENO, buf, sz);
                fflush(stdout);
                while ((sz = read(fd, buf, sizeof(buf))) > 0)
                        write(STDOUT_FILENO, buf, sz);
+               close(fd);
        }
 }
 
        }
 }
 
@@ -344,13 +353,12 @@ resp_begin_html(int code, const char *msg)
        printf("<!DOCTYPE html>\n"
               "<html>\n"
               "<head>\n"
        printf("<!DOCTYPE html>\n"
               "<html>\n"
               "<head>\n"
-              "<meta charset=\"UTF-8\"/>\n"
-              "<link rel=\"stylesheet\" href=\"%s/mandoc.css\""
+              "  <meta charset=\"UTF-8\"/>\n"
+              "  <link rel=\"stylesheet\" href=\"%s/mandoc.css\""
               " type=\"text/css\" media=\"all\">\n"
               " type=\"text/css\" media=\"all\">\n"
-              "<title>%s</title>\n"
+              "  <title>%s</title>\n"
               "</head>\n"
               "</head>\n"
-              "<body>\n"
-              "<!-- Begin page content. //-->\n",
+              "<body>\n",
               CSS_DIR, CUSTOMIZE_TITLE);
 
        resp_copy(MAN_DIR "/header.html");
               CSS_DIR, CUSTOMIZE_TITLE);
 
        resp_copy(MAN_DIR "/header.html");
@@ -367,74 +375,67 @@ resp_end_html(void)
 }
 
 static void
 }
 
 static void
-resp_searchform(const struct req *req)
+resp_searchform(const struct req *req, enum focus focus)
 {
        int              i;
 
 {
        int              i;
 
-       puts("<!-- Begin search form. //-->");
-       printf("<div id=\"mancgi\">\n"
-              "<form action=\"/%s\" method=\"get\">\n"
-              "<fieldset>\n"
-              "<legend>Manual Page Search Parameters</legend>\n",
+       printf("<form action=\"/%s\" method=\"get\">\n"
+              "  <fieldset>\n"
+              "    <legend>Manual Page Search Parameters</legend>\n",
               scriptname);
 
        /* Write query input box. */
 
               scriptname);
 
        /* Write query input box. */
 
-       printf( "<table><tr><td>\n"
-               "<input type=\"text\" name=\"query\" value=\"");
-       if (NULL != req->q.query)
+       printf("    <input type=\"text\" name=\"query\" value=\"");
+       if (req->q.query != NULL)
                html_print(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");
+       printf( "\" size=\"40\"");
+       if (focus == FOCUS_QUERY)
+               printf(" autofocus");
+       puts(">");
 
 
-       /* Write show radio button */
+       /* Write submission buttons. */
 
 
-       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");
+       printf( "    <button type=\"submit\" name=\"apropos\" value=\"0\">"
+               "man</button>\n"
+               "    <button type=\"submit\" name=\"apropos\" value=\"1\">"
+               "apropos</button>\n"
+               "    <br/>\n");
 
        /* Write section selector. */
 
 
        /* Write section selector. */
 
-       puts(   "</td></tr><tr><td>\n"
-               "<select name=\"sec\">");
+       puts("    <select name=\"sec\">");
        for (i = 0; i < sec_MAX; i++) {
        for (i = 0; i < sec_MAX; i++) {
-               printf("<option value=\"%s\"", sec_numbers[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]);
        }
                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>");
+       puts("    </select>");
 
        /* Write architecture selector. */
 
 
        /* Write architecture selector. */
 
-       printf( "<select name=\"arch\">\n"
-               "<option value=\"default\"");
+       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++) {
        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]);
+               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]);
        }
                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>");
+       puts("    </select>");
 
        /* Write manpath selector. */
 
        if (req->psz > 1) {
 
        /* Write manpath selector. */
 
        if (req->psz > 1) {
-               puts("<select name=\"manpath\">");
+               puts("    <select name=\"manpath\">");
                for (i = 0; i < (int)req->psz; i++) {
                for (i = 0; i < (int)req->psz; i++) {
-                       printf("<option ");
+                       printf("      <option ");
                        if (strcmp(req->q.manpath, req->p[i]) == 0)
                                printf("selected=\"selected\" ");
                        printf("value=\"");
                        if (strcmp(req->q.manpath, req->p[i]) == 0)
                                printf("selected=\"selected\" ");
                        printf("value=\"");
@@ -443,23 +444,11 @@ resp_searchform(const struct req *req)
                        html_print(req->p[i]);
                        puts("</option>");
                }
                        html_print(req->p[i]);
                        puts("</option>");
                }
-               puts("</select>");
+               puts("    </select>");
        }
 
        }
 
-       /* 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. //-->");
+       puts("  </fieldset>\n"
+            "</form>");
 }
 
 static int
 }
 
 static int
@@ -481,9 +470,6 @@ validate_manpath(const struct req *req, const char* manpath)
 {
        size_t   i;
 
 {
        size_t   i;
 
-       if ( ! strcmp(manpath, "mandoc"))
-               return 1;
-
        for (i = 0; i < req->psz; i++)
                if ( ! strcmp(manpath, req->p[i]))
                        return 1;
        for (i = 0; i < req->psz; i++)
                if ( ! strcmp(manpath, req->p[i]))
                        return 1;
@@ -507,12 +493,12 @@ pg_index(const struct req *req)
 {
 
        resp_begin_html(200, NULL);
 {
 
        resp_begin_html(200, NULL);
-       resp_searchform(req);
+       resp_searchform(req, FOCUS_QUERY);
        printf("<p>\n"
               "This web interface is documented in the\n"
        printf("<p>\n"
               "This web interface is documented in the\n"
-              "<a href=\"/%s%smandoc/man8/man.cgi.8\">man.cgi</a>\n"
+              "<a class=\"Xr\" href=\"/%s%sman.cgi.8\">man.cgi(8)</a>\n"
               "manual, and the\n"
               "manual, and the\n"
-              "<a href=\"/%s%smandoc/man1/apropos.1\">apropos</a>\n"
+              "<a class=\"Xr\" href=\"/%s%sapropos.1\">apropos(1)</a>\n"
               "manual explains the query syntax.\n"
               "</p>\n",
               scriptname, *scriptname == '\0' ? "" : "/",
               "manual explains the query syntax.\n"
               "</p>\n",
               scriptname, *scriptname == '\0' ? "" : "/",
@@ -524,7 +510,7 @@ static void
 pg_noresult(const struct req *req, const char *msg)
 {
        resp_begin_html(200, NULL);
 pg_noresult(const struct req *req, const char *msg)
 {
        resp_begin_html(200, NULL);
-       resp_searchform(req);
+       resp_searchform(req, FOCUS_QUERY);
        puts("<p>");
        puts(msg);
        puts("</p>");
        puts("<p>");
        puts(msg);
        puts("</p>");
@@ -588,30 +574,25 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
        }
 
        resp_begin_html(200, NULL);
        }
 
        resp_begin_html(200, NULL);
-       resp_searchform(req);
+       resp_searchform(req,
+           req->q.equal || sz == 1 ? FOCUS_NONE : FOCUS_QUERY);
 
        if (sz > 1) {
 
        if (sz > 1) {
-               puts("<div class=\"results\">");
-               puts("<table>");
-
+               puts("<table class=\"results\">");
                for (i = 0; i < sz; i++) {
                for (i = 0; i < sz; i++) {
-                       printf("<tr>\n"
-                              "<td class=\"title\">\n"
-                              "<a href=\"/%s%s%s/%s",
+                       printf("  <tr>\n"
+                              "    <td>"
+                              "<a class=\"Xr\" href=\"/%s%s%s/%s\">",
                            scriptname, *scriptname == '\0' ? "" : "/",
                            req->q.manpath, r[i].file);
                            scriptname, *scriptname == '\0' ? "" : "/",
                            req->q.manpath, r[i].file);
-                       printf("\">");
                        html_print(r[i].names);
                        html_print(r[i].names);
-                       printf("</a>\n"
-                              "</td>\n"
-                              "<td class=\"desc\">");
+                       printf("</a></td>\n"
+                              "    <td><span class=\"Nd\">");
                        html_print(r[i].output);
                        html_print(r[i].output);
-                       puts("</td>\n"
-                            "</tr>");
+                       puts("</span></td>\n"
+                            "  </tr>");
                }
                }
-
-               puts("</table>\n"
-                    "</div>");
+               puts("</table>");
        }
 
        /*
        }
 
        /*
@@ -661,7 +642,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
 }
 
 static void
 }
 
 static void
-catman(const struct req *req, const char *file)
+resp_catman(const struct req *req, const char *file)
 {
        FILE            *f;
        char            *p;
 {
        FILE            *f;
        char            *p;
@@ -798,7 +779,7 @@ catman(const struct req *req, const char *file)
 }
 
 static void
 }
 
 static void
-format(const struct req *req, const char *file)
+resp_format(const struct req *req, const char *file)
 {
        struct manoutput conf;
        struct mparse   *mp;
 {
        struct manoutput conf;
        struct mparse   *mp;
@@ -813,12 +794,14 @@ format(const struct req *req, const char *file)
        }
 
        mchars_alloc();
        }
 
        mchars_alloc();
-       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, req->q.manpath);
+       mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1,
+           MANDOCLEVEL_BADARG, NULL, req->q.manpath);
        mparse_readfd(mp, fd, file);
        close(fd);
 
        memset(&conf, 0, sizeof(conf));
        conf.fragment = 1;
        mparse_readfd(mp, fd, file);
        close(fd);
 
        memset(&conf, 0, sizeof(conf));
        conf.fragment = 1;
+       conf.style = mandoc_strdup(CSS_DIR "/mandoc.css");
        usepath = strcmp(req->q.manpath, req->p[0]);
        mandoc_asprintf(&conf.man, "/%s%s%%N.%%S",
            usepath ? req->q.manpath : "", usepath ? "/" : "");
        usepath = strcmp(req->q.manpath, req->p[0]);
        mandoc_asprintf(&conf.man, "/%s%s%%N.%%S",
            usepath ? req->q.manpath : "", usepath ? "/" : "");
@@ -846,6 +829,7 @@ format(const struct req *req, const char *file)
        mparse_free(mp);
        mchars_free();
        free(conf.man);
        mparse_free(mp);
        mchars_free();
        free(conf.man);
+       free(conf.style);
 }
 
 static void
 }
 
 static void
@@ -856,9 +840,9 @@ resp_show(const struct req *req, const char *file)
                file += 2;
 
        if ('c' == *file)
                file += 2;
 
        if ('c' == *file)
-               catman(req, file);
+               resp_catman(req, file);
        else
        else
-               format(req, file);
+               resp_format(req, file);
 }
 
 static void
 }
 
 static void
@@ -894,12 +878,7 @@ pg_show(struct req *req, const char *fullpath)
                free(manpath);
                return;
        }
                free(manpath);
                return;
        }
-
-       if (strcmp(manpath, "mandoc")) {
-               free(req->q.manpath);
-               req->q.manpath = manpath;
-       } else
-               free(manpath);
+       free(manpath);
 
        if ( ! validate_filename(file)) {
                pg_error_badrequest(
 
        if ( ! validate_filename(file)) {
                pg_error_badrequest(
@@ -908,7 +887,7 @@ pg_show(struct req *req, const char *fullpath)
        }
 
        resp_begin_html(200, NULL);
        }
 
        resp_begin_html(200, NULL);
-       resp_searchform(req);
+       resp_searchform(req, FOCUS_NONE);
        resp_show(req, file);
        resp_end_html();
 }
        resp_show(req, file);
        resp_end_html();
 }
@@ -999,6 +978,22 @@ main(void)
        const char      *querystring;
        int              i;
 
        const char      *querystring;
        int              i;
 
+#if HAVE_PLEDGE
+       /*
+        * The "rpath" pledge could be revoked after mparse_readfd()
+        * if the file desciptor to "/footer.html" would be opened
+        * up front, but it's probably not worth the complication
+        * of the code it would cause: it would require scattering
+        * pledge() calls in multiple low-level resp_*() functions.
+        */
+
+       if (pledge("stdio rpath", NULL) == -1) {
+               warn("pledge");
+               pg_error_internal();
+               return EXIT_FAILURE;
+       }
+#endif
+
        /* Poor man's ReDoS mitigation. */
 
        itimer.it_value.tv_sec = 2;
        /* Poor man's ReDoS mitigation. */
 
        itimer.it_value.tv_sec = 2;
@@ -1025,7 +1020,7 @@ main(void)
 
        memset(&req, 0, sizeof(struct req));
        req.q.equal = 1;
 
        memset(&req, 0, sizeof(struct req));
        req.q.equal = 1;
-       pathgen(&req);
+       parse_manpath_conf(&req);
 
        /* Parse the path info and the query string. */
 
 
        /* Parse the path info and the query string. */
 
@@ -1035,11 +1030,11 @@ main(void)
                path++;
 
        if (*path != '\0') {
                path++;
 
        if (*path != '\0') {
-               path_parse(&req, path);
-               if (access(path, F_OK) == -1)
+               parse_path_info(&req, path);
+               if (req.q.manpath == NULL || access(path, F_OK) == -1)
                        path = "";
        } else if ((querystring = getenv("QUERY_STRING")) != NULL)
                        path = "";
        } else if ((querystring = getenv("QUERY_STRING")) != NULL)
-               http_parse(&req, querystring);
+               parse_query_string(&req, querystring);
 
        /* Validate parsed data and add defaults. */
 
 
        /* Validate parsed data and add defaults. */
 
@@ -1080,13 +1075,15 @@ main(void)
  * If PATH_INFO is not a file name, translate it to a query.
  */
 static void
  * If PATH_INFO is not a file name, translate it to a query.
  */
 static void
-path_parse(struct req *req, const char *path)
+parse_path_info(struct req *req, const char *path)
 {
 {
-       char    *dir;
+       char    *dir[4];
+       int      i;
 
        req->isquery = 0;
        req->q.equal = 1;
        req->q.manpath = mandoc_strdup(path);
 
        req->isquery = 0;
        req->q.equal = 1;
        req->q.manpath = mandoc_strdup(path);
+       req->q.arch = NULL;
 
        /* Mandatory manual page name. */
        if ((req->q.query = strrchr(req->q.manpath, '/')) == NULL) {
 
        /* Mandatory manual page name. */
        if ((req->q.query = strrchr(req->q.manpath, '/')) == NULL) {
@@ -1105,34 +1102,57 @@ path_parse(struct req *req, const char *path)
        }
 
        /* Handle the case of name[.section] only. */
        }
 
        /* Handle the case of name[.section] only. */
-       if (req->q.manpath == NULL) {
-               req->q.arch = NULL;
+       if (req->q.manpath == NULL)
                return;
                return;
-       }
        req->q.query = mandoc_strdup(req->q.query);
 
        req->q.query = mandoc_strdup(req->q.query);
 
-       /* Optional architecture. */
-       dir = strrchr(req->q.manpath, '/');
-       if (dir != NULL && strncmp(dir + 1, "man", 3) != 0) {
-               *dir++ = '\0';
-               req->q.arch = mandoc_strdup(dir);
-               dir = strrchr(req->q.manpath, '/');
-       } else
-               req->q.arch = NULL;
+       /* Split directory components. */
+       dir[i = 0] = req->q.manpath;
+       while ((dir[i + 1] = strchr(dir[i], '/')) != NULL) {
+               if (++i == 3) {
+                       pg_error_badrequest(
+                           "You specified too many directory components.");
+                       exit(EXIT_FAILURE);
+               }
+               *dir[i]++ = '\0';
+       }
+
+       /* Optional manpath. */
+       if ((i = validate_manpath(req, req->q.manpath)) == 0)
+               req->q.manpath = NULL;
+       else if (dir[1] == NULL)
+               return;
 
 
-       /* Optional directory name. */
-       if (dir != NULL && strncmp(dir + 1, "man", 3) == 0) {
-               *dir++ = '\0';
+       /* Optional section. */
+       if (strncmp(dir[i], "man", 3) == 0) {
                free(req->q.sec);
                free(req->q.sec);
-               req->q.sec = mandoc_strdup(dir + 3);
+               req->q.sec = mandoc_strdup(dir[i++] + 3);
+       }
+       if (dir[i] == NULL) {
+               if (req->q.manpath == NULL)
+                       free(dir[0]);
+               return;
+       }
+       if (dir[i + 1] != NULL) {
+               pg_error_badrequest(
+                   "You specified an invalid directory component.");
+               exit(EXIT_FAILURE);
        }
        }
+
+       /* Optional architecture. */
+       if (i) {
+               req->q.arch = mandoc_strdup(dir[i]);
+               if (req->q.manpath == NULL)
+                       free(dir[0]);
+       } else
+               req->q.arch = dir[0];
 }
 
 /*
  * Scan for indexable paths.
  */
 static void
 }
 
 /*
  * Scan for indexable paths.
  */
 static void
-pathgen(struct req *req)
+parse_manpath_conf(struct req *req)
 {
        FILE    *fp;
        char    *dp;
 {
        FILE    *fp;
        char    *dp;
A git conversion mirror of mandoc.bsd.lv