=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.59 retrieving revision 1.66 diff -u -p -r1.59 -r1.66 --- mandoc/cgi.c 2014/07/09 16:23:01 1.59 +++ mandoc/cgi.c 2014/07/12 17:21:45 1.66 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.59 2014/07/09 16:23:01 schwarze Exp $ */ +/* $Id: cgi.c,v 1.66 2014/07/12 17:21:45 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -34,13 +34,6 @@ #include "manpath.h" #include "mansearch.h" -enum page { - PAGE_INDEX, - PAGE_SEARCH, - PAGE_SHOW, - PAGE__MAX -}; - /* * A query as passed to the search function. */ @@ -49,14 +42,13 @@ struct query { const char *arch; /* architecture */ const char *sec; /* manual section */ const char *expr; /* unparsed expression string */ - int legacy; /* whether legacy mode */ + int equal; /* match whole names, not substrings */ }; struct req { struct query q; char **p; /* array of available manpaths */ size_t psz; /* number of available manpaths */ - enum page page; }; static void catman(const struct req *, const char *); @@ -71,15 +63,13 @@ static void http_print(const char *); static void http_putchar(char); static void http_printquery(const struct req *); static void pathgen(struct req *); -static void pg_index(const struct req *, char *); -static void pg_search(const struct req *, char *); -static void pg_show(const struct req *, char *); +static void pg_search(const struct req *); +static void pg_show(const struct req *, const char *); static void resp_begin_html(int, const char *); static void resp_begin_http(int, const char *); static void resp_end_html(void); static void resp_error_badrequest(const char *); static void resp_error_internal(void); -static void resp_error_notfound(const char *); static void resp_index(const struct req *); static void resp_noresult(const struct req *, const char *); @@ -92,12 +82,6 @@ static const char *mandir; /* contains all manpath di static const char *cssdir; /* css directory */ static const char *httphost; /* hostname used in the URIs */ -static const char * const pages[PAGE__MAX] = { - "index", /* PAGE_INDEX */ - "search", /* PAGE_SEARCH */ - "show", /* PAGE_SHOW */ -}; - /* * Print a character, escaping HTML along the way. * This will pass non-ASCII straight to output: be warned! @@ -142,9 +126,11 @@ http_printquery(const struct req *req) http_print(req->q.arch); } if (NULL != req->q.expr) { - printf("&expr="); - http_print(req->q.expr ? req->q.expr : ""); + printf("&query="); + http_print(req->q.expr); } + if (0 == req->q.equal) + printf("&apropos=1"); } static void @@ -164,9 +150,11 @@ html_printquery(const struct req *req) html_print(req->q.arch); } if (NULL != req->q.expr) { - printf("&expr="); - html_print(req->q.expr ? req->q.expr : ""); + printf("&query="); + html_print(req->q.expr); } + if (0 == req->q.equal) + printf("&apropos=1"); } static void @@ -202,12 +190,11 @@ static void http_parse(struct req *req, char *p) { char *key, *val; - int legacy; memset(&req->q, 0, sizeof(struct query)); req->q.manpath = req->p[0]; + req->q.equal = 1; - legacy = -1; while ('\0' != *p) { key = p; val = NULL; @@ -228,37 +215,21 @@ http_parse(struct req *req, char *p) if (NULL != val && ! http_decode(val)) break; - if (0 == strcmp(key, "expr")) + if (0 == strcmp(key, "query")) req->q.expr = val; - else if (0 == strcmp(key, "query")) - req->q.expr = val; - else if (0 == strcmp(key, "sec")) - req->q.sec = val; - else if (0 == strcmp(key, "sektion")) - req->q.sec = val; - else if (0 == strcmp(key, "arch")) - req->q.arch = val; else if (0 == strcmp(key, "manpath")) req->q.manpath = val; else if (0 == strcmp(key, "apropos")) - legacy = 0 == strcmp(val, "0"); + req->q.equal = !strcmp(val, "0"); + else if (0 == strcmp(key, "sec") || + 0 == strcmp(key, "sektion")) { + if (strcmp(val, "0")) + req->q.sec = val; + } else if (0 == strcmp(key, "arch")) { + if (strcmp(val, "default")) + req->q.arch = val; + } } - - /* Test for old man.cgi compatibility mode. */ - - req->q.legacy = legacy > 0; - - /* - * Section "0" means no section when in legacy mode. - * For some man.cgi scripts, "default" arch is none. - */ - - if (req->q.legacy && NULL != req->q.sec) - if (0 == strcmp(req->q.sec, "0")) - req->q.sec = NULL; - if (req->q.legacy && NULL != req->q.arch) - if (0 == strcmp(req->q.arch, "default")) - req->q.arch = NULL; } static void @@ -284,11 +255,13 @@ static int http_decode(char *p) { char hex[3]; + char *q; int c; hex[2] = '\0'; - for ( ; '\0' != *p; p++) { + q = p; + for ( ; '\0' != *p; p++, q++) { if ('%' == *p) { if ('\0' == (hex[0] = *(p + 1))) return(0); @@ -299,13 +272,13 @@ http_decode(char *p) if ('\0' == c) return(0); - *p = (char)c; - memmove(p + 1, p + 3, strlen(p + 3) + 1); + *q = (char)c; + p += 2; } else - *p = '+' == *p ? ' ' : *p; + *q = '+' == *p ? ' ' : *p; } - *p = '\0'; + *q = '\0'; return(1); } @@ -314,12 +287,12 @@ resp_begin_http(int code, const char *msg) { if (200 != code) - printf("Status: %d %s\n", code, msg); + printf("Status: %d %s\r\n", code, msg); - puts("Content-Type: text/html; charset=utf-8\n" - "Cache-Control: no-cache\n" - "Pragma: no-cache\n" - ""); + printf("Content-Type: text/html; charset=utf-8\r\n" + "Cache-Control: no-cache\r\n" + "Pragma: no-cache\r\n" + "\r\n"); fflush(stdout); } @@ -363,13 +336,23 @@ resp_searchform(const struct req *req) puts(""); printf("
\n" - "
\n" + "\n" "
\n" "Search Parameters\n" - " for manuals satisfying \n" - " " + "for manuals \n", scriptname); + printf("\n" + "q.expr ? req->q.expr : ""); printf("\">, section " "q.arch ? req->q.arch : ""); printf("\">"); if (req->psz > 1) { - puts(", "); for (i = 0; i < (int)req->psz; i++) { printf("
\n" "
\n" @@ -408,7 +391,19 @@ resp_index(const struct req *req) { resp_begin_html(200, NULL); + puts("

\n" + "Online manuals with " + "mandoc\n" + "

"); resp_searchform(req); + printf("

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

\n", + scriptname, scriptname); resp_end_html(); } @@ -438,24 +433,6 @@ resp_error_badrequest(const char *msg) } static void -resp_error_notfound(const char *page) -{ - - resp_begin_html(404, "Not Found"); - puts("

Page Not Found

\n" - "

\n" - "The page you're looking for, "); - printf(""); - html_print(page); - printf(",\n" - "could not be found.\n" - "Try searching from the\n" - "main page.\n" - "

", scriptname); - resp_end_html(); -} - -static void resp_error_internal(void) { resp_begin_html(500, "Internal Server Error"); @@ -473,12 +450,13 @@ resp_search(const struct req *req, struct manpage *r, * If we have just one result, then jump there now * without any delay. */ - puts("Status: 303 See Other"); - printf("Location: http://%s%s/show/%s/%s?", + printf("Status: 303 See Other\r\n"); + printf("Location: http://%s%s/%s/%s?", httphost, scriptname, req->q.manpath, r[0].file); http_printquery(req); - puts("\n" - "Content-Type: text/html; charset=utf-8\n"); + printf("\r\n" + "Content-Type: text/html; charset=utf-8\r\n" + "\r\n"); return; } @@ -492,7 +470,7 @@ resp_search(const struct req *req, struct manpage *r, for (i = 0; i < sz; i++) { printf("\n" "\n" - "q.manpath, r[i].file); html_printquery(req); printf("\">"); @@ -510,15 +488,7 @@ resp_search(const struct req *req, struct manpage *r, resp_end_html(); } -/* ARGSUSED */ static void -pg_index(const struct req *req, char *path) -{ - - resp_index(req); -} - -static void catman(const struct req *req, const char *file) { FILE *f; @@ -685,7 +655,7 @@ format(const struct req *req, const char *file) } snprintf(opts, sizeof(opts), - "fragment,man=%s/search?sec=%%S&expr=Nm~^%%N$", + "fragment,man=%s?query=%%N&sec=%%S", scriptname); mparse_result(mp, &mdoc, &man, NULL); @@ -715,7 +685,7 @@ format(const struct req *req, const char *file) } static void -pg_show(const struct req *req, char *path) +pg_show(const struct req *req, const char *path) { char *sub; @@ -745,7 +715,7 @@ pg_show(const struct req *req, char *path) } static void -pg_search(const struct req *req, char *path) +pg_search(const struct req *req) { struct mansearch search; struct manpaths paths; @@ -769,8 +739,8 @@ pg_search(const struct req *req, char *path) search.arch = req->q.arch; search.sec = req->q.sec; - search.deftype = TYPE_Nm | TYPE_Nd; - search.flags = 0; + search.deftype = req->q.equal ? TYPE_Nm : (TYPE_Nm | TYPE_Nd); + search.flags = req->q.equal ? MANSEARCH_MAN : 0; paths.sz = 1; paths.paths = mandoc_malloc(sizeof(char *)); @@ -824,9 +794,10 @@ pg_search(const struct req *req, char *path) int main(void) { - int i; struct req req; - char *querystring, *path, *subpath; + const char *path; + char *querystring; + int i; /* Scan our run-time environment. */ @@ -863,52 +834,20 @@ main(void) if (NULL != (querystring = getenv("QUERY_STRING"))) http_parse(&req, querystring); - /* - * Now juggle paths to extract information. - * We want to extract our filetype (the file suffix), the - * initial path component, then the trailing component(s). - * Start with leading subpath component. - */ + /* Dispatch to the three different pages. */ - subpath = path = NULL; - req.page = PAGE__MAX; + path = getenv("PATH_INFO"); + if (NULL == path) + path = ""; + else if ('/' == *path) + path++; - if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path) - req.page = PAGE_INDEX; - - if (NULL != path && '/' == *path && '\0' == *++path) - req.page = PAGE_INDEX; - - /* Resolve subpath component. */ - - if (NULL != path && NULL != (subpath = strchr(path, '/'))) - *subpath++ = '\0'; - - /* Map path into one we recognise. */ - - if (NULL != path && '\0' != *path) - for (i = 0; i < (int)PAGE__MAX; i++) - if (0 == strcmp(pages[i], path)) { - req.page = (enum page)i; - break; - } - - /* Route pages. */ - - switch (req.page) { - case (PAGE_INDEX): - pg_index(&req, subpath); - break; - case (PAGE_SEARCH): - pg_search(&req, subpath); - break; - case (PAGE_SHOW): - pg_show(&req, subpath); - break; - default: - resp_error_notfound(path); - break; - } + if ('\0' != *path) + pg_show(&req, path); + else if (NULL != req.q.expr) + pg_search(&req); + else + resp_index(&req); for (i = 0; i < (int)req.psz; i++) free(req.p[i]);