=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.85 retrieving revision 1.101 diff -u -p -r1.85 -r1.101 --- mandoc/cgi.c 2014/07/25 16:56:06 1.85 +++ mandoc/cgi.c 2014/11/11 19:04:55 1.101 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.85 2014/07/25 16:56:06 schwarze Exp $ */ +/* $Id: cgi.c,v 1.101 2014/11/11 19:04:55 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -15,14 +15,16 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif +#include +#include + #include #include #include #include +#include #include #include #include @@ -55,13 +57,12 @@ struct req { static void catman(const struct req *, const char *); static void format(const struct req *, const char *); static void html_print(const char *); -static void html_printquery(const struct req *); static void html_putchar(char); static int http_decode(char *); static void http_parse(struct req *, const char *); static void http_print(const char *); static void http_putchar(char); -static void http_printquery(const struct req *); +static void http_printquery(const struct req *, const char *); static void pathgen(struct req *); static void pg_error_badrequest(const char *); static void pg_error_internal(void); @@ -91,14 +92,14 @@ static const char *const sec_names[] = { "All Sections", "1 - General Commands", "2 - System Calls", - "3 - Subroutines", - "3p - Perl Subroutines", - "4 - Special Files", + "3 - Library Functions", + "3p - Perl Library", + "4 - Device Drivers", "5 - File Formats", "6 - Games", - "7 - Macros and Conventions", - "8 - Maintenance Commands", - "9 - Kernel Interface" + "7 - Miscellaneous Information", + "8 - System Manager\'s Manual", + "9 - Kernel Developer\'s Manual" }; static const int sec_MAX = sizeof(sec_names) / sizeof(char *); @@ -145,51 +146,28 @@ html_putchar(char c) } static void -http_printquery(const struct req *req) +http_printquery(const struct req *req, const char *sep) { - if (NULL != req->q.manpath) { - printf("&manpath="); - http_print(req->q.manpath); - } - if (NULL != req->q.sec) { - printf("&sec="); - http_print(req->q.sec); - } - if (NULL != req->q.arch) { - printf("&arch="); - http_print(req->q.arch); - } if (NULL != req->q.query) { - printf("&query="); + printf("query="); http_print(req->q.query); } if (0 == req->q.equal) - printf("&apropos=1"); -} - -static void -html_printquery(const struct req *req) -{ - - if (NULL != req->q.manpath) { - printf("&manpath="); - html_print(req->q.manpath); - } + printf("%sapropos=1", sep); if (NULL != req->q.sec) { - printf("&sec="); - html_print(req->q.sec); + printf("%ssec=", sep); + http_print(req->q.sec); } if (NULL != req->q.arch) { - printf("&arch="); - html_print(req->q.arch); + printf("%sarch=", sep); + http_print(req->q.arch); } - if (NULL != req->q.query) { - printf("&query="); - html_print(req->q.query); + if (NULL != req->q.manpath && + strcmp(req->q.manpath, req->p[0])) { + printf("%smanpath=", sep); + http_print(req->q.manpath); } - if (0 == req->q.equal) - printf("&apropos=1"); } static void @@ -398,13 +376,10 @@ resp_begin_html(int code, const char *msg) resp_begin_http(code, msg); - printf("\n" + printf("\n" "\n" "\n" - "\n" + "\n" "\n" "\n" "q.equal) - printf("CHECKED "); + printf("CHECKED=\"checked\" "); printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n" "\n"); /* Write section selector. */ - printf( "\n" + puts( "\n" ""); @@ -477,13 +452,13 @@ resp_searchform(const struct req *req) printf( ""); @@ -496,7 +471,7 @@ resp_searchform(const struct req *req) printf("