=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.177 retrieving revision 1.178 diff -u -p -r1.177 -r1.178 --- mandoc/cgi.c 2022/07/04 16:20:42 1.177 +++ mandoc/cgi.c 2022/07/05 14:04:25 1.178 @@ -1,6 +1,6 @@ -/* $Id: cgi.c,v 1.177 2022/07/04 16:20:42 schwarze Exp $ */ +/* $Id: cgi.c,v 1.178 2022/07/05 14:04:25 schwarze Exp $ */ /* - * Copyright (c) 2014-2019, 2021 Ingo Schwarze + * Copyright (c) 2014-2019, 2021, 2022 Ingo Schwarze * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2022 Anna Vyalkova * @@ -87,10 +87,10 @@ 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 *, const char *); +static int resp_begin_html(int, const char *, 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 int resp_copy(const char *, const char *); static void resp_end_html(void); static void resp_format(const struct req *, const char *); static void resp_searchform(const struct req *, enum focus); @@ -353,22 +353,26 @@ resp_begin_http(int code, const char *msg) fflush(stdout); } -static void -resp_copy(const char *filename) +static int +resp_copy(const char *element, const char *filename) { char buf[4096]; ssize_t sz; int fd; - if ((fd = open(filename, O_RDONLY)) != -1) { - fflush(stdout); - while ((sz = read(fd, buf, sizeof(buf))) > 0) - write(STDOUT_FILENO, buf, sz); - close(fd); - } + if ((fd = open(filename, O_RDONLY)) == -1) + return 0; + + if (element != NULL) + printf("<%s>\n", element); + fflush(stdout); + while ((sz = read(fd, buf, sizeof(buf))) > 0) + write(STDOUT_FILENO, buf, sz); + close(fd); + return 1; } -static void +static int resp_begin_html(int code, const char *msg, const char *file) { const char *name, *sec, *cp; @@ -414,15 +418,15 @@ resp_begin_html(int code, const char *msg, const char "\n", CUSTOMIZE_TITLE); - resp_copy(MAN_DIR "/header.html"); + return resp_copy("header", MAN_DIR "/header.html"); } static void resp_end_html(void) { + if (resp_copy("footer", MAN_DIR "/footer.html")) + puts(""); - resp_copy(MAN_DIR "/footer.html"); - puts("\n" ""); } @@ -432,8 +436,7 @@ resp_searchform(const struct req *req, enum focus focu { int i; - printf("

\n" - "\n" - "

"); + ""); } static int @@ -557,10 +559,11 @@ validate_filename(const char *file) static void pg_index(const struct req *req) { - - resp_begin_html(200, NULL, NULL); + if (resp_begin_html(200, NULL, NULL) == 0) + puts("

"); resp_searchform(req, FOCUS_QUERY); - printf("

\n" + printf("

\n" + "

\n" "

\n" "This web interface is documented in the\n" ""); resp_searchform(req, FOCUS_QUERY); + puts(""); puts("

"); puts(user_msg); @@ -593,8 +598,8 @@ pg_noresult(const struct req *req, int code, const cha static void pg_error_badrequest(const char *msg) { - - resp_begin_html(400, "Bad Request", NULL); + if (resp_begin_html(400, "Bad Request", NULL)) + puts(""); puts("

Bad Request

"); @@ -602,14 +607,15 @@ pg_error_badrequest(const char *msg) printf("Try again from the\n" "main page.\n" "

\n" - "

", scriptname); + "

\n", scriptname); resp_end_html(); } static void pg_error_internal(void) { - resp_begin_html(500, "Internal Server Error", NULL); + if (resp_begin_html(500, "Internal Server Error", NULL)) + puts(""); puts("

Internal Server Error

"); resp_end_html(); } @@ -641,6 +647,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t i, iuse; int archprio, archpriouse; int prio, priouse; + int have_header; for (i = 0; i < sz; i++) { if (validate_filename(r[i].file)) @@ -707,12 +714,15 @@ pg_searchres(const struct req *req, struct manpage *r, priouse = prio; iuse = i; } - resp_begin_html(200, NULL, r[iuse].file); + have_header = resp_begin_html(200, NULL, r[iuse].file); } else - resp_begin_html(200, NULL, NULL); + have_header = resp_begin_html(200, NULL, NULL); + if (have_header == 0) + puts("

"); resp_searchform(req, req->q.equal || sz == 1 ? FOCUS_NONE : FOCUS_QUERY); + puts("

"); if (sz > 1) { puts("