=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.143 retrieving revision 1.145 diff -u -p -r1.143 -r1.145 --- mandoc/cgi.c 2017/01/19 13:55:56 1.143 +++ mandoc/cgi.c 2017/01/25 02:14:43 1.145 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.143 2017/01/19 13:55:56 schwarze Exp $ */ +/* $Id: cgi.c,v 1.145 2017/01/25 02:14:43 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze @@ -494,9 +494,9 @@ pg_index(const struct req *req) resp_searchform(req, FOCUS_QUERY); printf("

\n" "This web interface is documented in the\n" - "man.cgi(8)\n" + "man.cgi(8)\n" "manual, and the\n" - "apropos(1)\n" + "apropos(1)\n" "manual explains the query syntax.\n" "

\n", scriptname, *scriptname == '\0' ? "" : "/", @@ -576,26 +576,21 @@ pg_searchres(const struct req *req, struct manpage *r, req->q.equal || sz == 1 ? FOCUS_NONE : FOCUS_QUERY); if (sz > 1) { - puts("
"); - puts(""); - + puts("
"); for (i = 0; i < sz; i++) { printf(" \n" - " \n" - " \n" + puts("\n" " "); } - - puts("
" - "" + "", scriptname, *scriptname == '\0' ? "" : "/", req->q.manpath, r[i].file); - printf("\">"); html_print(r[i].names); printf(""); + " "); html_print(r[i].output); - puts("
\n" - "
"); + puts(""); } /* @@ -804,6 +799,7 @@ resp_format(const struct req *req, const char *file) 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 ? "/" : ""); @@ -831,6 +827,7 @@ resp_format(const struct req *req, const char *file) mparse_free(mp); mchars_free(); free(conf.man); + free(conf.style); } static void