The termination condition of the iteration logic in page_bymacro()

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 0cd320c74977cf6808050b47c0262a9f6b58360d..30a0ea430e315ddd417976c2371f1fec6f0a8ab4 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.130 2016/04/28 17:59:14 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.141 2016/09/12 00:06:20 schwarze Exp $ */

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


@@ -59,6 +59,11 @@ struct       req {
        int               isquery; /* QUERY_STRING used, not PATH_INFO */
 };
 
        int               isquery; /* QUERY_STRING used, not PATH_INFO */
 };
 

+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 *);


@@ -79,7 +84,7 @@ static        void             resp_catman(const struct req *, const char *);
 static void             resp_copy(const char *);
 static void             resp_end_html(void);
 static void             resp_format(const struct req *, const char *);
 static void             resp_copy(const char *);
 static void             resp_end_html(void);
 static void             resp_format(const struct req *, const char *);

-static void             resp_searchform(const struct req *);
+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 +113,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",
+    "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 +138,7 @@ html_putchar(char c)
 
        switch (c) {
        case ('"'):
 
        switch (c) {
        case ('"'):

-               printf("&quote;");
+               printf("&quot;");

                break;
        case ('&'):
                printf("&amp;");
                break;
        case ('&'):
                printf("&amp;");


@@ -332,6 +338,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);

        }
 }
 
        }
 }
 


@@ -367,7 +374,7 @@ 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;
 


@@ -380,30 +387,24 @@ resp_searchform(const struct req *req)
 
        /* Write query input box. */
 
 
        /* 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\" autofocus>");
-
-       /* 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++) {
                printf("<option value=\"%s\"", sec_numbers[i]);
                if (NULL != req->q.sec &&
        for (i = 0; i < sec_MAX; i++) {
                printf("<option value=\"%s\"", sec_numbers[i]);
                if (NULL != req->q.sec &&


@@ -446,17 +447,7 @@ resp_searchform(const struct req *req)
                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"
+       puts("</fieldset>\n"

             "</form>\n"
             "</div>");
        puts("<!-- End search form. //-->");
             "</form>\n"
             "</div>");
        puts("<!-- End search form. //-->");


@@ -481,9 +472,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 +495,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 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 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 +512,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,7 +576,8 @@ 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) {
                puts("<div class=\"results\">");
 
        if (sz > 1) {
                puts("<div class=\"results\">");


@@ -813,7 +802,8 @@ resp_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);
 
        mparse_readfd(mp, fd, file);
        close(fd);
 


@@ -894,12 +884,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 +893,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();
 }


@@ -1036,7 +1021,7 @@ main(void)
 
        if (*path != '\0') {
                parse_path_info(&req, path);
 
        if (*path != '\0') {
                parse_path_info(&req, path);

-               if (access(path, F_OK) == -1)
+               if (req.q.manpath == NULL || access(path, F_OK) == -1)

                        path = "";
        } else if ((querystring = getenv("QUERY_STRING")) != NULL)
                parse_query_string(&req, querystring);
                        path = "";
        } else if ((querystring = getenv("QUERY_STRING")) != NULL)
                parse_query_string(&req, querystring);


@@ -1082,11 +1067,13 @@ main(void)
 static void
 parse_path_info(struct req *req, const char *path)
 {
 static void
 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,27 +1092,50 @@ parse_path_info(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 directory name. */
-       if (dir != NULL && strncmp(dir + 1, "man", 3) == 0) {
-               *dir++ = '\0';
+       /* Optional manpath. */
+       if ((i = validate_manpath(req, req->q.manpath)) == 0)
+               req->q.manpath = NULL;
+       else if (dir[1] == NULL)
+               return;
+
+       /* 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];

 }
 
 /*
 }
 
 /*