=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.35 retrieving revision 1.41 diff -u -p -r1.35 -r1.41 --- mandoc/cgi.c 2011/12/16 12:06:35 1.35 +++ mandoc/cgi.c 2012/03/24 00:31:55 1.41 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.35 2011/12/16 12:06:35 kristaps Exp $ */ +/* $Id: cgi.c,v 1.41 2012/03/24 00:31:55 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -41,6 +41,7 @@ #include "man.h" #include "main.h" #include "manpath.h" +#include "mandocdb.h" #ifdef __linux__ # include @@ -68,7 +69,6 @@ struct query { const char *sec; /* manual section */ const char *expr; /* unparsed expression string */ int manroot; /* manroot index (or -1)*/ - int whatis; /* whether whatis mode */ int legacy; /* whether legacy mode */ }; @@ -84,9 +84,13 @@ static void catman(const struct req *, const char *) static int cmp(const void *, const void *); 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 *, char *); +static void http_print(const char *); +static void http_putchar(char); +static void http_printquery(const struct req *); static int pathstop(DIR *); static void pathgen(DIR *, char *, struct req *); static void pg_index(const struct req *, char *); @@ -130,7 +134,7 @@ atou(const char *buf, unsigned *v) return(0); if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) || - (lval > UINT_MAX || lval < 0)) + (lval > INT_MAX || lval < 0)) return(0); *v = (unsigned int)lval; @@ -163,7 +167,41 @@ html_putchar(char c) break; } } +static void +http_printquery(const struct req *req) +{ + printf("&expr="); + http_print(req->q.expr ? req->q.expr : ""); + printf("&sec="); + http_print(req->q.sec ? req->q.sec : ""); + printf("&arch="); + http_print(req->q.arch ? req->q.arch : ""); +} + + +static void +html_printquery(const struct req *req) +{ + + printf("&expr="); + html_print(req->q.expr ? req->q.expr : ""); + printf("&sec="); + html_print(req->q.sec ? req->q.sec : ""); + printf("&arch="); + html_print(req->q.arch ? req->q.arch : ""); +} + +static void +http_print(const char *p) +{ + + if (NULL == p) + return; + while ('\0' != *p) + http_putchar(*p++); +} + /* * Call through to html_putchar(). * Accepts NULL strings. @@ -187,51 +225,31 @@ static void http_parse(struct req *req, char *p) { char *key, *val, *manroot; - size_t sz; int i, legacy; memset(&req->q, 0, sizeof(struct query)); - req->q.whatis = 1; legacy = -1; manroot = NULL; - while (p && '\0' != *p) { - while (' ' == *p) - p++; - + while ('\0' != *p) { key = p; val = NULL; - if (NULL != (p = strchr(p, '='))) { + p += (int)strcspn(p, ";&"); + if ('\0' != *p) *p++ = '\0'; - val = p; + if (NULL != (val = strchr(key, '='))) + *val++ = '\0'; - sz = strcspn(p, ";&"); - /* LINTED */ - p += sz; - - if ('\0' != *p) - *p++ = '\0'; - } else { - p = key; - sz = strcspn(p, ";&"); - /* LINTED */ - p += sz; - - if ('\0' != *p) - p++; + if ('\0' == *key || NULL == val || '\0' == *val) continue; - } - if ('\0' == *key || '\0' == *val) - continue; - /* Just abort handling. */ if ( ! http_decode(key)) break; - if ( ! http_decode(val)) + if (NULL != val && ! http_decode(val)) break; if (0 == strcmp(key, "expr")) @@ -248,19 +266,11 @@ http_parse(struct req *req, char *p) manroot = val; else if (0 == strcmp(key, "apropos")) legacy = 0 == strcmp(val, "0"); - else if (0 == strcmp(key, "op")) - req->q.whatis = 0 == strcasecmp(val, "whatis"); } /* Test for old man.cgi compatibility mode. */ - if (legacy == 0) { - req->q.whatis = 0; - req->q.legacy = 1; - } else if (legacy > 0) { - req->q.legacy = 1; - req->q.whatis = 1; - } + req->q.legacy = legacy > 0; /* * Section "0" means no section when in legacy mode. @@ -284,6 +294,20 @@ http_parse(struct req *req, char *p) } } +static void +http_putchar(char c) +{ + + if (isalnum((unsigned char)c)) { + putchar((unsigned char)c); + return; + } else if (' ' == c) { + putchar('+'); + return; + } + printf("%%%.2x", c); +} + /* * HTTP-decode a string. The standard explanation is that this turns * "%4e+foo" into "n foo" in the regular way. This is done in-place @@ -374,10 +398,8 @@ resp_searchform(const struct req *req) "
\n" "
\n" "Search Parameters\n" - " or \n" - " for manuals satisfying \n" + " for manuals satisfying \n" "q.expr ? req->q.expr : ""); @@ -473,60 +495,64 @@ resp_baddb(void) static void resp_search(struct res *r, size_t sz, void *arg) { - int i; + size_t i, matched; const struct req *req; req = (const struct req *)arg; - assert(req->q.manroot >= 0); - if (1 == sz) { + if (sz > 0) + assert(req->q.manroot >= 0); + + for (matched = i = 0; i < sz; i++) + if (r[i].matched) + matched++; + + if (1 == matched) { + for (i = 0; i < sz; i++) + if (r[i].matched) + break; /* * If we have just one result, then jump there now * without any delay. */ puts("Status: 303 See Other"); - printf("Location: http://%s%s/show/%d/%u/%u.html\n", + printf("Location: http://%s%s/show/%d/%u/%u.html?", host, progname, req->q.manroot, - r[0].volume, r[0].rec); - puts("Content-Type: text/html; charset=utf-8\n"); + r[i].volume, r[i].rec); + http_printquery(req); + puts("\n" + "Content-Type: text/html; charset=utf-8\n"); return; } - qsort(r, sz, sizeof(struct res), cmp); - resp_begin_html(200, NULL); resp_searchform(req); puts("
"); - if (0 == sz) { - printf("

\n" - "No %s results found.\n", - req->q.whatis ? "whatis" : "apropos"); - if (req->q.whatis) { - printf("(Try q.expr ? req->q.expr : ""); - printf("&sec="); - html_print(req->q.sec ? req->q.sec : ""); - printf("&arch="); - html_print(req->q.arch ? req->q.arch : ""); - puts("\">apropos?)"); - } - puts("

"); - puts("
"); + if (0 == matched) { + puts("

\n" + "No results found.\n" + "

\n" + ""); resp_end_html(); return; } + qsort(r, sz, sizeof(struct res), cmp); + puts(""); - for (i = 0; i < (int)sz; i++) { + for (i = 0; i < sz; i++) { + if ( ! r[i].matched) + continue; printf("\n" "
\n" - "", + "q.manroot, r[i].volume, r[i].rec); + html_printquery(req); + printf("\">"); html_print(r[i].title); putchar('('); html_print(r[i].cat); @@ -807,7 +833,8 @@ pg_show(const struct req *req, char *path) sz = strlcpy(file, ps.paths[vol], MAXPATHLEN); assert(sz < MAXPATHLEN); - strlcat(file, "/mandoc.index", MAXPATHLEN); + strlcat(file, "/", MAXPATHLEN); + strlcat(file, MANDOC_IDX, MAXPATHLEN); /* Open the index recno(3) database. */ @@ -852,10 +879,11 @@ out: static void pg_search(const struct req *req, char *path) { - size_t tt; + size_t tt, ressz; struct manpaths ps; int i, sz, rc; const char *ep, *start; + struct res *res; char **cp; struct opts opt; struct expr *expr; @@ -873,6 +901,8 @@ pg_search(const struct req *req, char *path) rc = -1; sz = 0; cp = NULL; + ressz = 0; + res = NULL; /* * Begin by chdir()ing into the root of the manpath. @@ -915,25 +945,26 @@ pg_search(const struct req *req, char *path) * The resp_search() function is called with the results. */ - expr = req->q.whatis ? + expr = req->q.legacy ? termcomp(sz, cp, &tt) : exprcomp(sz, cp, &tt); if (NULL != expr) rc = apropos_search - (ps.sz, ps.paths, &opt, - expr, tt, (void *)req, resp_search); + (ps.sz, ps.paths, &opt, expr, tt, + (void *)req, &ressz, &res, resp_search); /* ...unless errors occured. */ if (0 == rc) resp_baddb(); else if (-1 == rc) - resp_search(NULL, 0, (void *)req); + resp_search(NULL, 0, NULL); for (i = 0; i < sz; i++) free(cp[i]); free(cp); + resfree(res, ressz); exprfree(expr); manpath_free(&ps); }