=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.28 retrieving revision 1.35 diff -u -p -r1.28 -r1.35 --- mandoc/cgi.c 2011/12/10 23:09:25 1.28 +++ mandoc/cgi.c 2011/12/16 12:06:35 1.35 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.28 2011/12/10 23:09:25 kristaps Exp $ */ +/* $Id: cgi.c,v 1.35 2011/12/16 12:06:35 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -80,9 +80,9 @@ struct req { }; static int atou(const char *, unsigned *); -static void catman(const char *); +static void catman(const struct req *, const char *); static int cmp(const void *, const void *); -static void format(const char *); +static void format(const struct req *, const char *); static void html_print(const char *); static void html_putchar(char); static int http_decode(char *); @@ -103,9 +103,10 @@ static void resp_index(const struct req *); static void resp_search(struct res *, size_t, void *); static void resp_searchform(const struct req *); -static const char *progname; -static const char *cache; -static const char *host; +static const char *progname; /* cgi script name */ +static const char *cache; /* cache directory */ +static const char *css; /* css directory */ +static const char *host; /* hostname */ static const char * const pages[PAGE__MAX] = { "index", /* PAGE_INDEX */ @@ -338,19 +339,21 @@ resp_begin_html(int code, const char *msg) resp_begin_http(code, msg); - puts("\n" - "\n" - "\n" - "\n" - "\n" - "System Manpage Reference\n" - "\n" - "\n" - ""); + printf("\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "System Manpage Reference\n" + "\n" + "\n" + "\n", css, css); } static void @@ -367,16 +370,16 @@ resp_searchform(const struct req *req) int i; puts(""); - printf("
\n"); - printf("
\n" + printf("
\n" + "\n" + "
\n" "Search Parameters\n" " or \n" " for manuals satisfying \n" - "q.expr ? req->q.expr : ""); printf("\">, section " "\n" "
\n" - ""); + "\n" + "
"); puts(""); } @@ -472,14 +476,17 @@ resp_search(struct res *r, size_t sz, void *arg) int i; const struct req *req; + req = (const struct req *)arg; + assert(req->q.manroot >= 0); + if (1 == sz) { /* * If we have just one result, then jump there now * without any delay. */ puts("Status: 303 See Other"); - printf("Location: http://%s%s/show/%u/%u.html\n", - host, progname, + printf("Location: http://%s%s/show/%d/%u/%u.html\n", + host, progname, req->q.manroot, r[0].volume, r[0].rec); puts("Content-Type: text/html; charset=utf-8\n"); return; @@ -488,18 +495,17 @@ resp_search(struct res *r, size_t sz, void *arg) qsort(r, sz, sizeof(struct res), cmp); resp_begin_html(200, NULL); - - req = (const struct req *)arg; 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 : ""); @@ -508,21 +514,18 @@ resp_search(struct res *r, size_t sz, void *arg) puts("\">apropos?)"); } puts("

"); + puts("
"); resp_end_html(); return; } - puts("

\n" - ""); + puts("
"); - assert(req->q.manroot >= 0); for (i = 0; i < (int)sz; i++) { printf("\n" ""); } - puts("
\n" - "", - req->q.manroot, + "", + progname, req->q.manroot, r[i].volume, r[i].rec); html_print(r[i].title); putchar('('); @@ -539,7 +542,8 @@ resp_search(struct res *r, size_t sz, void *arg) "
"); + puts("\n" + ""); resp_end_html(); } @@ -552,7 +556,7 @@ pg_index(const struct req *req, char *path) } static void -catman(const char *file) +catman(const struct req *req, const char *file) { FILE *f; size_t len; @@ -565,20 +569,9 @@ catman(const char *file) return; } - resp_begin_http(200, NULL); - puts("\n" - "\n" - "\n" - "\n" - "\n" - "System Manpage Reference\n" - "\n" - "\n" - "\n" + resp_begin_html(200, NULL); + resp_searchform(req); + puts("
\n" "
");
 
 	while (NULL != (p = fgetln(f, &len))) {
@@ -691,6 +684,7 @@ catman(const char *file)
 	}
 
 	puts("
\n" + "
\n" "\n" ""); @@ -698,7 +692,7 @@ catman(const char *file) } static void -format(const char *file) +format(const struct req *req, const char *file) { struct mparse *mp; int fd; @@ -722,23 +716,31 @@ format(const char *file) return; } - snprintf(opts, sizeof(opts), "style=/man.css," + snprintf(opts, sizeof(opts), "fragment," "man=%s/search.html?sec=%%S&expr=%%N," /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/, progname); mparse_result(mp, &mdoc, &man); + if (NULL == man && NULL == mdoc) { + resp_baddb(); + mparse_free(mp); + return; + } + + resp_begin_html(200, NULL); + resp_searchform(req); + vp = html_alloc(opts); - if (NULL != mdoc) { - resp_begin_http(200, NULL); + if (NULL != mdoc) html_mdoc(vp, mdoc); - } else if (NULL != man) { - resp_begin_http(200, NULL); + else html_man(vp, man); - } else - resp_baddb(); + puts("\n" + ""); + html_free(vp); mparse_free(mp); } @@ -747,10 +749,11 @@ static void pg_show(const struct req *req, char *path) { struct manpaths ps; + size_t sz; char *sub; char file[MAXPATHLEN]; - const char *fn, *cp; - int rc; + const char *cp; + int rc, catm; unsigned int vol, rec, mr; DB *idx; DBT key, val; @@ -795,14 +798,15 @@ pg_show(const struct req *req, char *path) } memset(&ps, 0, sizeof(struct manpaths)); - manpath_manconf("etc/catman.conf", &ps); + manpath_manconf(&ps, "etc/catman.conf"); if (vol >= (unsigned int)ps.sz) { resp_error400(); goto out; } - strlcpy(file, ps.paths[vol], MAXPATHLEN); + sz = strlcpy(file, ps.paths[vol], MAXPATHLEN); + assert(sz < MAXPATHLEN); strlcat(file, "/mandoc.index", MAXPATHLEN); /* Open the index recno(3) database. */ @@ -820,21 +824,24 @@ pg_show(const struct req *req, char *path) if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) { rc < 0 ? resp_baddb() : resp_error400(); goto out; - } + } else if (0 == val.size) { + resp_baddb(); + goto out; + } cp = (char *)val.data; + catm = 'c' == *cp++; - if (NULL == (fn = memchr(cp, '\0', val.size))) + if (NULL == memchr(cp, '\0', val.size - 1)) resp_baddb(); - else if (++fn - cp >= (int)val.size) - resp_baddb(); - else if (NULL == memchr(fn, '\0', val.size - (fn - cp))) - resp_baddb(); else { - if (0 == strcmp(cp, "cat")) - catman(fn + 1); + file[(int)sz] = '\0'; + strlcat(file, "/", MAXPATHLEN); + strlcat(file, cp, MAXPATHLEN); + if (catm) + catman(req, file); else - format(fn + 1); + format(req, file); } out: if (idx) @@ -881,7 +888,7 @@ pg_search(const struct req *req, char *path) } memset(&ps, 0, sizeof(struct manpaths)); - manpath_manconf("etc/catman.conf", &ps); + manpath_manconf(&ps, "etc/catman.conf"); /* * Poor man's tokenisation: just break apart by spaces. @@ -942,16 +949,16 @@ main(void) /* Scan our run-time environment. */ - progname = getenv("SCRIPT_NAME"); - if (NULL == progname) + if (NULL == (cache = getenv("CACHE_DIR"))) + cache = "/cache/man.cgi"; + + if (NULL == (progname = getenv("SCRIPT_NAME"))) progname = ""; - cache = getenv("CACHE_DIR"); - if (NULL == cache) - cache = "/cache/man.cgi"; + if (NULL == (css = getenv("CSS_DIR"))) + css = ""; - host = getenv("HTTP_HOST"); - if (NULL == host) + if (NULL == (host = getenv("HTTP_HOST"))) host = "localhost"; /*