Delete a sentence pointing to "the Predefined Strings subsection

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 4762f819d57d356def43264b9c2893ca2853972f..3ab63952a469ecac0bcf27cd680d7a2f70985114 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,7 +1,7 @@
-/*     $Id: cgi.c,v 1.167 2019/07/10 12:49:20 schwarze Exp $ */
+/* $Id: cgi.c,v 1.173 2020/06/29 19:22:09 schwarze Exp $ */
 /*
+ * Copyright (c) 2014-2019 Ingo Schwarze <schwarze@usta.de>
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015, 2016, 2017, 2018 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
@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Implementation of the man.cgi(8) program.
  */
 #include "config.h"
 
@@ -70,14 +72,15 @@ enum        focus {
 static void             html_print(const char *);
 static void             html_putchar(char);
 static int              http_decode(char *);
-static void             http_encode(const char *p);
+static void             http_encode(const char *);
 static void             parse_manpath_conf(struct req *);
-static void             parse_path_info(struct req *req, const char *path);
+static void             parse_path_info(struct req *, const char *);
 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_noresult(const struct req *, const char *);
+static void             pg_noresult(const struct req *, int, const char *,
+                               const char *);
 static void             pg_redirect(const struct req *, const char *);
 static void             pg_search(const struct req *);
 static void             pg_searchres(const struct req *,
@@ -119,10 +122,11 @@ static    const char *const sec_names[] = {
 static const int sec_MAX = sizeof(sec_names) / sizeof(char *);
 
 static const char *const arch_names[] = {
-    "amd64",       "alpha",       "armv7",     "arm64",
-    "hppa",        "i386",        "landisk",
-    "loongson",    "luna88k",     "macppc",      "mips64",
-    "octeon",      "sgi",         "socppc",      "sparc64",
+    "amd64",       "alpha",       "armv7",       "arm64",
+    "hppa",        "i386",        "landisk",     "loongson",
+    "luna88k",     "macppc",      "mips64",      "octeon",
+    "powerpc64",   "sgi",         "socppc",      "sparc64",
+
     "amiga",       "arc",         "armish",      "arm32",
     "atari",       "aviion",      "beagle",      "cats",
     "hppa64",      "hp300",
@@ -339,6 +343,8 @@ resp_begin_http(int code, const char *msg)
 
        printf("Content-Type: text/html; charset=utf-8\r\n"
             "Cache-Control: no-cache\r\n"
+            "Content-Security-Policy: default-src 'none'; "
+            "style-src 'self' 'unsafe-inline'\r\n"
             "Pragma: no-cache\r\n"
             "\r\n");
 
@@ -408,7 +414,8 @@ resp_searchform(const struct req *req, enum focus focus)
 {
        int              i;
 
-       printf("<form action=\"/%s\" method=\"get\">\n"
+       printf("<form action=\"/%s\" method=\"get\" "
+              "autocomplete=\"off\" autocapitalize=\"none\">\n"
               "  <fieldset>\n"
               "    <legend>Manual Page Search Parameters</legend>\n",
               scriptname);
@@ -546,12 +553,13 @@ pg_index(const struct req *req)
 }
 
 static void
-pg_noresult(const struct req *req, const char *msg)
+pg_noresult(const struct req *req, int code, const char *http_msg,
+    const char *user_msg)
 {
-       resp_begin_html(200, NULL, NULL);
+       resp_begin_html(code, http_msg, NULL);
        resp_searchform(req, FOCUS_QUERY);
        puts("<p>");
-       puts(msg);
+       puts(user_msg);
        puts("</p>");
        resp_end_html();
 }
@@ -1016,9 +1024,10 @@ pg_search(const struct req *req)
        if (req->isquery && req->q.equal && argc == 1)
                pg_redirect(req, argv[0]);
        else if (mansearch(&search, &paths, argc, argv, &res, &ressz) == 0)
-               pg_noresult(req, "You entered an invalid query.");
+               pg_noresult(req, 400, "Bad Request",
+                   "You entered an invalid query.");
        else if (ressz == 0)
-               pg_noresult(req, "No results found.");
+               pg_noresult(req, 404, "Not Found", "No results found.");
        else
                pg_searchres(req, res, ressz);