=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.128 retrieving revision 1.132 diff -u -p -r1.128 -r1.132 --- mandoc/cgi.c 2016/04/15 16:42:52 1.128 +++ mandoc/cgi.c 2016/05/28 13:40:48 1.132 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.128 2016/04/15 16:42:52 schwarze Exp $ */ +/* $Id: cgi.c,v 1.132 2016/05/28 13:40:48 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2016 Ingo Schwarze @@ -59,14 +59,17 @@ struct req { int isquery; /* QUERY_STRING used, not PATH_INFO */ }; -static void catman(const struct req *, const char *); -static void format(const struct req *, const char *); +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 http_parse(struct req *, const char *); -static void pathgen(struct req *); -static void path_parse(struct req *req, const char *path); +static void parse_manpath_conf(struct req *); +static void parse_path_info(struct req *req, const char *path); +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 *); @@ -77,9 +80,11 @@ static void pg_searchres(const struct req *, static void pg_show(struct req *, const char *); static void resp_begin_html(int, 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 void resp_end_html(void); -static void resp_searchform(const struct req *); +static void resp_format(const struct req *, const char *); +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 *); @@ -185,7 +190,7 @@ set_query_attr(char **attr, char **val) * and store the values into the query structure. */ static void -http_parse(struct req *req, const char *qs) +parse_query_string(struct req *req, const char *qs) { char *key, *val; size_t keysz, valsz; @@ -367,7 +372,7 @@ resp_end_html(void) } static void -resp_searchform(const struct req *req) +resp_searchform(const struct req *req, enum focus focus) { int i; @@ -380,30 +385,24 @@ resp_searchform(const struct req *req) /* Write query input box. */ - printf( "
\n" - "q.query) + printf("q.query != NULL) html_print(req->q.query); - puts("\" size=\"40\">"); + printf( "\" size=\"40\""); + if (focus == FOCUS_QUERY) + printf(" autofocus"); + puts(">"); - /* Write submission and reset buttons. */ + /* Write submission buttons. */ - printf( "\n" - "\n"); + printf( "\n" + "\n
\n"); - /* Write show radio button */ - - printf( "		\n" - "q.equal) - printf("checked=\"checked\" "); - printf( "name=\"apropos\" id=\"show\" value=\"0\">\n" - "\n"); - /* Write section selector. */ - puts( "
\n" - ""); for (i = 0; i < sec_MAX; i++) { printf("\n" - "q.equal) - printf("checked=\"checked\" "); - printf( "name=\"apropos\" id=\"search\" value=\"1\">\n" - "\n"); - - puts("
\n" - "\n" + puts("\n" "\n" ""); puts(""); @@ -507,7 +496,7 @@ pg_index(const struct req *req) { resp_begin_html(200, NULL); - resp_searchform(req); + resp_searchform(req, FOCUS_QUERY); printf("

\n" "This web interface is documented in the\n" "man.cgi\n" @@ -524,7 +513,7 @@ static void pg_noresult(const struct req *req, const char *msg) { resp_begin_html(200, NULL); - resp_searchform(req); + resp_searchform(req, FOCUS_QUERY); puts("

"); puts(msg); puts("

"); @@ -588,7 +577,8 @@ pg_searchres(const struct req *req, struct manpage *r, } resp_begin_html(200, NULL); - resp_searchform(req); + resp_searchform(req, + req->q.equal || sz == 1 ? FOCUS_NONE : FOCUS_QUERY); if (sz > 1) { puts("
"); @@ -661,7 +651,7 @@ pg_searchres(const struct req *req, struct manpage *r, } static void -catman(const struct req *req, const char *file) +resp_catman(const struct req *req, const char *file) { FILE *f; char *p; @@ -798,7 +788,7 @@ catman(const struct req *req, const char *file) } static void -format(const struct req *req, const char *file) +resp_format(const struct req *req, const char *file) { struct manoutput conf; struct mparse *mp; @@ -856,9 +846,9 @@ resp_show(const struct req *req, const char *file) file += 2; if ('c' == *file) - catman(req, file); + resp_catman(req, file); else - format(req, file); + resp_format(req, file); } static void @@ -908,7 +898,7 @@ pg_show(struct req *req, const char *fullpath) } resp_begin_html(200, NULL); - resp_searchform(req); + resp_searchform(req, FOCUS_NONE); resp_show(req, file); resp_end_html(); } @@ -1025,7 +1015,7 @@ main(void) memset(&req, 0, sizeof(struct req)); req.q.equal = 1; - pathgen(&req); + parse_manpath_conf(&req); /* Parse the path info and the query string. */ @@ -1035,11 +1025,11 @@ main(void) path++; if (*path != '\0') { - path_parse(&req, path); + parse_path_info(&req, path); if (access(path, F_OK) == -1) path = ""; } else if ((querystring = getenv("QUERY_STRING")) != NULL) - http_parse(&req, querystring); + parse_query_string(&req, querystring); /* Validate parsed data and add defaults. */ @@ -1080,7 +1070,7 @@ main(void) * If PATH_INFO is not a file name, translate it to a query. */ static void -path_parse(struct req *req, const char *path) +parse_path_info(struct req *req, const char *path) { char *dir; @@ -1132,7 +1122,7 @@ path_parse(struct req *req, const char *path) * Scan for indexable paths. */ static void -pathgen(struct req *req) +parse_manpath_conf(struct req *req) { FILE *fp; char *dp;