===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.5
retrieving revision 1.11
diff -u -p -r1.5 -r1.11
--- mandoc/cgi.c 2011/11/20 12:39:08 1.5
+++ mandoc/cgi.c 2011/12/07 11:52:36 1.11
@@ -1,101 +1,164 @@
-/* $Id: cgi.c,v 1.5 2011/11/20 12:39:08 kristaps Exp $ */
+/* $Id: cgi.c,v 1.11 2011/12/07 11:52:36 kristaps Exp $ */
+/*
+ * Copyright (c) 2011 Kristaps Dzonsons \n"
+ " The query your entered was malformed.\n"
+ " Try again from the\n"
+ " main page\n"
+ " \n"
+ " The page you're looking for, ");
+ printf(" ");
+ html_print(page);
+ puts(",\n"
+ " could not be found.\n"
+ " Try searching from the\n"
+ " main page\n"
+ " Generic badness happened. Your database is broken. No results found. ", r[i].volume, r[i].rec);
+ html_print(r[i].title);
putchar('(');
- html_printtext(recs[i].cat);
- puts(")");
+ html_print(r[i].cat);
+ if (r[i].arch && '\0' != *r[i].arch) {
+ putchar('/');
+ html_print(r[i].arch);
+ }
+ printf(")Malformed Query
\n"
+ "Page Not Found
\n"
+ "
"); + while (NULL != (p = fgetln(f, &len))) { + bold = italic = 0; + for (i = 0; i < (int)len - 1; i++) { + /* + * This means that the catpage is out of state. + * Ignore it and keep going (although the + * catpage is bogus). + */ + + if ('\b' == p[i] || '\n' == p[i]) + continue; + + /* + * Print a regular character. + * Close out any bold/italic scopes. + * If we're in back-space mode, make sure we'll + * have something to enter when we backspace. + */ + + if ('\b' != p[i + 1]) { + if (italic) + printf(""); + if (bold) + printf(""); + italic = bold = 0; + html_putchar(p[i]); + continue; + } else if (i + 2 >= (int)len) + continue; + + /* Italic mode. */ + + if ('_' == p[i]) { + if (bold) + printf(""); + if ( ! italic) + printf(""); + bold = 0; + italic = 1; + i += 2; + html_putchar(p[i]); + continue; + } + + /* + * Handle funny behaviour troff-isms. + * These grok'd from the original man2html.c. + */ + + if (('+' == p[i] && 'o' == p[i + 2]) || + ('o' == p[i] && '+' == p[i + 2]) || + ('|' == p[i] && '=' == p[i + 2]) || + ('=' == p[i] && '|' == p[i + 2]) || + ('*' == p[i] && '=' == p[i + 2]) || + ('=' == p[i] && '*' == p[i + 2]) || + ('*' == p[i] && '|' == p[i + 2]) || + ('|' == p[i] && '*' == p[i + 2])) { + if (italic) + printf(""); + if (bold) + printf(""); + italic = bold = 0; + putchar('*'); + i += 2; + continue; + } else if (('|' == p[i] && '-' == p[i + 2]) || + ('-' == p[i] && '|' == p[i + 1]) || + ('+' == p[i] && '-' == p[i + 1]) || + ('-' == p[i] && '+' == p[i + 1]) || + ('+' == p[i] && '|' == p[i + 1]) || + ('|' == p[i] && '+' == p[i + 1])) { + if (italic) + printf(""); + if (bold) + printf(""); + italic = bold = 0; + putchar('+'); + i += 2; + continue; + } + + /* Bold mode. */ + + if (italic) + printf(""); + if ( ! bold) + printf(""); + bold = 1; + italic = 0; + i += 2; + html_putchar(p[i]); + } + + /* + * Clean up the last character. + * We can get to a newline; don't print that. + */ + + if (italic) + printf(""); + if (bold) + printf(""); + + if (i == (int)len - 1 && '\n' != p[i]) + html_putchar(p[i]); + + putchar('\n'); + } + + puts("\n" + "\n" + ""); + + fclose(f); +} + +static void +format(const char *file) +{ + struct mparse *mp; + int fd; + struct mdoc *mdoc; + struct man *man; + void *vp; + enum mandoclevel rc; + char opts[MAXPATHLEN + 128]; + + if (-1 == (fd = open(file, O_RDONLY, 0))) { + resp_baddb(); return; + } + mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL); + rc = mparse_readfd(mp, fd, file); + close(fd); + + if (rc >= MANDOCLEVEL_FATAL) { + resp_baddb(); + return; + } + + snprintf(opts, sizeof(opts), "style=/man.css," + "man=%s/search.html?sec=%%S&expr=%%N," + /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/, + progname); + + mparse_result(mp, &mdoc, &man); + vp = html_alloc(opts); + + if (NULL != mdoc) { + resp_begin_http(200, NULL); + html_mdoc(vp, mdoc); + } else if (NULL != man) { + resp_begin_http(200, NULL); + html_man(vp, man); + } else + resp_baddb(); + + html_free(vp); + mparse_free(mp); +} + +static void +pg_show(const struct manpaths *ps, const struct req *req, char *path) +{ + char *sub; + char file[MAXPATHLEN]; + const char *fn, *cp; + int rc; + unsigned int vol, rec; + DB *idx; + DBT key, val; + + if (NULL == path) { + resp_error400(); + return; + } else if (NULL == (sub = strrchr(path, '/'))) { + resp_error400(); + return; + } else + *sub++ = '\0'; + + if ( ! (atou(path, &vol) && atou(sub, &rec))) { + resp_error400(); + return; + } else if (vol >= (unsigned int)ps->sz) { + resp_error400(); + return; + } + + strlcpy(file, ps->paths[vol], MAXPATHLEN); + strlcat(file, "/mandoc.index", MAXPATHLEN); + + /* Open the index recno(3) database. */ + + idx = dbopen(file, O_RDONLY, 0, DB_RECNO, NULL); + if (NULL == idx) { + resp_baddb(); + return; + } + + key.data = &rec; + key.size = 4; + + if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) { + rc < 0 ? resp_baddb() : resp_error400(); + goto out; + } + + cp = (char *)val.data; + + if (NULL == (fn = memchr(cp, '\0', val.size))) + resp_baddb(); + else if (++fn - cp >= (int)val.size) + resp_baddb(); + else if (NULL == memchr(fn, '\0', val.size - (fn - cp))) + resp_baddb(); + else { + strlcpy(file, ps->paths[vol], MAXPATHLEN); + strlcat(file, "/", MAXPATHLEN); + strlcat(file, fn, MAXPATHLEN); + if (0 == strcmp(cp, "cat")) + catman(file); + else + format(file); + } +out: + (*idx->close)(idx); +} + +static void +pg_search(const struct manpaths *ps, const struct req *req, char *path) +{ + size_t tt; + int i, sz, rc; + const char *ep, *start; + char **cp; + struct opts opt; + struct expr *expr; + + expr = NULL; + cp = NULL; + ep = NULL; + sz = 0; + memset(&opt, 0, sizeof(struct opts)); - /*opt.types = TYPE_NAME | TYPE_DESC; - apropos_search(&opt, req->fields[i].val, NULL, pg_searchres);*/ + + for (sz = i = 0; i < (int)req->fieldsz; i++) + if (0 == strcmp(req->fields[i].key, "expr")) + ep = req->fields[i].val; + else if (0 == strcmp(req->fields[i].key, "sec")) + opt.cat = req->fields[i].val; + else if (0 == strcmp(req->fields[i].key, "arch")) + opt.arch = req->fields[i].val; + + /* + * Poor man's tokenisation. + * Just break apart by spaces. + * Yes, this is half-ass. But it works for now. + */ + + while (ep && isspace((unsigned char)*ep)) + ep++; + + while (ep && '\0' != *ep) { + cp = mandoc_realloc(cp, (sz + 1) * sizeof(char *)); + start = ep; + while ('\0' != *ep && ! isspace((unsigned char)*ep)) + ep++; + cp[sz] = mandoc_malloc((ep - start) + 1); + memcpy(cp[sz], start, ep - start); + cp[sz++][ep - start] = '\0'; + while (isspace((unsigned char)*ep)) + ep++; + } + + rc = -1; + + /* + * Pump down into apropos backend. + * The resp_search() function is called with the results. + */ + + if (NULL != (expr = exprcomp(sz, cp, &tt))) + rc = apropos_search + (ps->sz, ps->paths, &opt, + expr, tt, (void *)req, resp_search); + + /* ...unless errors occured. */ + + if (0 == rc) + resp_baddb(); + else if (-1 == rc) + resp_search(NULL, 0, (void *)req); + + for (i = 0; i < sz; i++) + free(cp[i]); + + free(cp); + exprfree(expr); } int @@ -257,37 +794,56 @@ main(void) { int i; struct req req; - char *p; - char *path, *subpath, *suffix; + char *p, *path, *subpath; + struct manpaths paths; + /* HTTP init: read and parse the query string. */ + + progname = getenv("SCRIPT_NAME"); + if (NULL == progname) + progname = ""; + + cache = getenv("CACHE_DIR"); + if (NULL == cache) + cache = "/cache/man.cgi"; + + if (-1 == chdir(cache)) { + resp_bad(); + return(EXIT_FAILURE); + } + + host = getenv("HTTP_HOST"); + if (NULL == host) + host = "localhost"; + memset(&req, 0, sizeof(struct req)); if (NULL != (p = getenv("QUERY_STRING"))) kval_parse(&req.fields, &req.fieldsz, p); - suffix = subpath = path = NULL; + /* Resolve leading subpath component. */ - req.media = MEDIA_HTML; + subpath = path = NULL; req.page = PAGE__MAX; if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path) req.page = PAGE_INDEX; + if (NULL != path && '/' == *path && '\0' == *++path) req.page = PAGE_INDEX; - if (NULL != path && NULL != (suffix = strrchr(path, '.'))) - if (NULL != suffix && NULL == strchr(suffix, '/')) - *suffix++ = '\0'; + /* Strip file suffix. */ + if (NULL != path && NULL != (p = strrchr(path, '.'))) + if (NULL != p && NULL == strchr(p, '/')) + *p++ = '\0'; + + /* Resolve subpath component. */ + if (NULL != path && NULL != (subpath = strchr(path, '/'))) - *subpath++ = '\0'; + *subpath++ = '\0'; - if (NULL != suffix && '\0' != *suffix) - for (i = 0; i < (int)MEDIA__MAX; i++) - if (0 == strcmp(medias[i], suffix)) { - req.media = (enum media)i; - break; - } + /* Map path into one we recognise. */ if (NULL != path && '\0' != *path) for (i = 0; i < (int)PAGE__MAX; i++) @@ -296,18 +852,30 @@ main(void) break; } + /* Initialise MANPATH. */ + + memset(&paths, 0, sizeof(struct manpaths)); + manpath_manconf("etc/catman.conf", &paths); + + /* Route pages. */ + switch (req.page) { case (PAGE_INDEX): - pg_index(&req, subpath); + pg_index(&paths, &req, subpath); break; case (PAGE_SEARCH): - pg_search(&req, subpath); + pg_search(&paths, &req, subpath); break; + case (PAGE_SHOW): + pg_show(&paths, &req, subpath); + break; default: - /* Blah */ + resp_error404(path); break; } + manpath_free(&paths); kval_free(req.fields, req.fieldsz); + return(EXIT_SUCCESS); }