===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.11
retrieving revision 1.73
diff -u -p -r1.11 -r1.73
--- mandoc/cgi.c 2011/12/07 11:52:36 1.11
+++ mandoc/cgi.c 2014/07/13 15:38:36 1.73
@@ -1,6 +1,7 @@
-/* $Id: cgi.c,v 1.11 2011/12/07 11:52:36 kristaps Exp $ */
+/* $Id: cgi.c,v 1.73 2014/07/13 15:38:36 schwarze Exp $ */
/*
- * Copyright (c) 2011 Kristaps Dzonsons
+ * Copyright (c) 2011, 2012 Kristaps Dzonsons
+ * Copyright (c) 2014 Ingo Schwarze
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -18,111 +19,106 @@
#include "config.h"
#endif
-#include
-#include
-
-#include
#include
#include
#include
#include
-#include
#include
-#include
-#include
#include
#include
#include
-#include "apropos_db.h"
#include "mandoc.h"
-#include "mdoc.h"
-#include "man.h"
+#include "mandoc_aux.h"
#include "main.h"
#include "manpath.h"
+#include "mansearch.h"
+#include "cgi.h"
-#ifdef __linux__
-# include
-#else
-# include
-#endif
-
-enum page {
- PAGE_INDEX,
- PAGE_SEARCH,
- PAGE_SHOW,
- PAGE__MAX
+/*
+ * A query as passed to the search function.
+ */
+struct query {
+ const char *manpath; /* desired manual directory */
+ const char *arch; /* architecture */
+ const char *sec; /* manual section */
+ const char *expr; /* unparsed expression string */
+ int equal; /* match whole names, not substrings */
};
-struct kval {
- char *key;
- char *val;
-};
-
struct req {
- struct kval *fields;
- size_t fieldsz;
- enum page page;
+ struct query q;
+ char **p; /* array of available manpaths */
+ size_t psz; /* number of available manpaths */
};
-static int atou(const char *, unsigned *);
-static void catman(const char *);
-static void format(const char *);
+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 kval_decode(char *);
-static void kval_parse(struct kval **, size_t *, char *);
-static void kval_free(struct kval *, size_t);
-static void pg_index(const struct manpaths *,
- const struct req *, char *);
-static void pg_search(const struct manpaths *,
- const struct req *, char *);
-static void pg_show(const struct manpaths *,
- const struct req *, char *);
-static void resp_bad(void);
-static void resp_baddb(void);
-static void resp_error400(void);
-static void resp_error404(const 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 void pathgen(struct req *);
+static void pg_error_badrequest(const char *);
+static void pg_error_internal(void);
+static void pg_index(const struct req *);
+static void pg_noresult(const struct req *, const char *);
+static void pg_search(const struct req *);
+static void pg_searchres(const struct req *,
+ struct manpage *, size_t);
+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_index(const struct req *);
-static void resp_search(struct res *, size_t, void *);
static void resp_searchform(const struct req *);
+static void resp_show(const struct req *, const char *);
-static const char *progname;
-static const char *cache;
-static const char *host;
+static const char *scriptname; /* CGI script name */
+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 */
+static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
+static const char *const sec_numbers[] = {
+ "0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9"
};
+static const char *const sec_names[] = {
+ "All Sections",
+ "1 - General Commands",
+ "2 - System Calls",
+ "3 - Subroutines",
+ "3p - Perl Subroutines",
+ "4 - Special Files",
+ "5 - File Formats",
+ "6 - Games",
+ "7 - Macros and Conventions",
+ "8 - Maintenance Commands",
+ "9 - Kernel Interface"
+};
+static const int sec_MAX = sizeof(sec_names) / sizeof(char *);
+static const char *const arch_names[] = {
+ "amd64", "alpha", "armish", "armv7",
+ "aviion", "hppa", "hppa64", "i386",
+ "ia64", "landisk", "loongson", "luna88k",
+ "macppc", "mips64", "octeon", "sgi",
+ "socppc", "solbourne", "sparc", "sparc64",
+ "vax", "zaurus",
+ "amiga", "arc", "arm32", "atari",
+ "beagle", "cats", "hp300", "mac68k",
+ "mvme68k", "mvme88k", "mvmeppc", "palm",
+ "pc532", "pegasos", "pmax", "powerpc",
+ "sun3", "wgrisc", "x68k"
+};
+static const int arch_MAX = sizeof(arch_names) / sizeof(char *);
+
/*
- * This is just OpenBSD's strtol(3) suggestion.
- * I use it instead of strtonum(3) for portability's sake.
+ * Print a character, escaping HTML along the way.
+ * This will pass non-ASCII straight to output: be warned!
*/
-static int
-atou(const char *buf, unsigned *v)
-{
- char *ep;
- long lval;
-
- errno = 0;
- lval = strtol(buf, &ep, 10);
- if (buf[0] == '\0' || *ep != '\0')
- return(0);
- if ((errno == ERANGE && (lval == LONG_MAX ||
- lval == LONG_MIN)) ||
- (lval > UINT_MAX || lval < 0))
- return(0);
-
- *v = (unsigned int)lval;
- return(1);
-}
-
static void
html_putchar(char c)
{
@@ -146,9 +142,67 @@ html_putchar(char c)
}
}
+static void
+http_printquery(const struct req *req)
+{
+
+ if (NULL != req->q.manpath) {
+ printf("&manpath=");
+ http_print(req->q.manpath);
+ }
+ if (NULL != req->q.sec) {
+ printf("&sec=");
+ http_print(req->q.sec);
+ }
+ if (NULL != req->q.arch) {
+ printf("&arch=");
+ http_print(req->q.arch);
+ }
+ if (NULL != req->q.expr) {
+ printf("&query=");
+ http_print(req->q.expr);
+ }
+ if (0 == req->q.equal)
+ printf("&apropos=1");
+}
+
+static void
+html_printquery(const struct req *req)
+{
+
+ if (NULL != req->q.manpath) {
+ printf("&manpath=");
+ html_print(req->q.manpath);
+ }
+ if (NULL != req->q.sec) {
+ printf("&sec=");
+ html_print(req->q.sec);
+ }
+ if (NULL != req->q.arch) {
+ printf("&arch=");
+ html_print(req->q.arch);
+ }
+ if (NULL != req->q.expr) {
+ printf("&query=");
+ html_print(req->q.expr);
+ }
+ if (0 == req->q.equal)
+ printf("&apropos=1");
+}
+
+static void
+http_print(const char *p)
+{
+
+ if (NULL == p)
+ return;
+ while ('\0' != *p)
+ http_putchar(*p++);
+}
+
/*
- * Print a word, escaping HTML along the way.
- * This will pass non-ASCII straight to output: be warned!
+ * Call through to html_putchar().
+ * Accepts NULL strings.
*/
static void
html_print(const char *p)
@@ -160,79 +214,80 @@ html_print(const char *p)
html_putchar(*p++);
}
-static void
-kval_free(struct kval *p, size_t sz)
-{
- int i;
-
- for (i = 0; i < (int)sz; i++) {
- free(p[i].key);
- free(p[i].val);
- }
- free(p);
-}
-
/*
* Parse out key-value pairs from an HTTP request variable.
* This can be either a cookie or a POST/GET string, although man.cgi
* uses only GET for simplicity.
*/
static void
-kval_parse(struct kval **kv, size_t *kvsz, char *p)
+http_parse(struct req *req, char *p)
{
char *key, *val;
- size_t sz, cur;
- cur = 0;
+ memset(&req->q, 0, sizeof(struct query));
+ req->q.manpath = req->p[0];
+ req->q.equal = 1;
- 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 ( ! kval_decode(key))
- return;
- if ( ! kval_decode(val))
- return;
+ if ( ! http_decode(key))
+ break;
+ if (NULL != val && ! http_decode(val))
+ break;
- if (*kvsz + 1 >= cur) {
- cur++;
- *kv = mandoc_realloc
- (*kv, cur * sizeof(struct kval));
+ if (0 == strcmp(key, "query"))
+ req->q.expr = val;
+ else if (0 == strcmp(key, "manpath")) {
+#ifdef COMPAT_OLDURI
+ if (0 == strncmp(val, "OpenBSD ", 8)) {
+ val[7] = '-';
+ if ('C' == val[8])
+ val[8] = 'c';
+ }
+#endif
+ req->q.manpath = val;
+ } else if (0 == strcmp(key, "apropos"))
+ req->q.equal = !strcmp(val, "0");
+ else if (0 == strcmp(key, "sec")) {
+ if (strcmp(val, "0"))
+ req->q.sec = val;
+#ifdef COMPAT_OLDURI
+ } else if (0 == strcmp(key, "sektion")) {
+ if (strcmp(val, "0"))
+ req->q.sec = val;
+#endif
+ } else if (0 == strcmp(key, "arch")) {
+ if (strcmp(val, "default"))
+ req->q.arch = val;
}
+ }
+}
- (*kv)[(int)*kvsz].key = mandoc_strdup(key);
- (*kv)[(int)*kvsz].val = mandoc_strdup(val);
- (*kvsz)++;
+static void
+http_putchar(char c)
+{
+
+ if (isalnum((unsigned char)c)) {
+ putchar((unsigned char)c);
+ return;
+ } else if (' ' == c) {
+ putchar('+');
+ return;
}
+ printf("%%%.2x", c);
}
/*
@@ -241,14 +296,16 @@ kval_parse(struct kval **kv, size_t *kvsz, char *p)
* over the allocated string.
*/
static int
-kval_decode(char *p)
+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);
@@ -259,13 +316,13 @@ kval_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);
}
@@ -274,12 +331,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);
}
@@ -290,189 +347,253 @@ resp_begin_html(int code, const char *msg)
resp_begin_http(code, msg);
- puts("" "\n"
- "" "\n"
- " " "\n"
- " " "\n"
- " System Manpage Reference " "\n"
- " " "\n"
- " " "\n"
- "");
+ printf("\n"
+ "\n"
+ "\n"
+ " \n"
+ " \n"
+ " \n"
+ "%s \n"
+ "\n"
+ "\n"
+ "\n",
+ CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE);
}
static void
resp_end_html(void)
{
- puts(" \n");
+ puts("\n"
+ "");
}
static void
resp_searchform(const struct req *req)
{
- int i;
- const char *expr, *sec, *arch;
+ int i;
- expr = sec = arch = "";
+ puts(CUSTOMIZE_BEGIN);
+ puts("");
+ printf("");
+ puts("");
}
static void
-resp_index(const struct req *req)
+pg_index(const struct req *req)
{
resp_begin_html(200, NULL);
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();
}
static void
-resp_error400(void)
+pg_noresult(const struct req *req, const char *msg)
{
-
- resp_begin_html(400, "Query Malformed");
- puts("Malformed Query \n"
- "\n"
- " The query your entered was malformed.\n"
- " Try again from the\n"
- " main page \n"
- "
");
+ resp_begin_html(200, NULL);
+ resp_searchform(req);
+ puts("");
+ puts(msg);
+ puts("
");
resp_end_html();
}
static void
-resp_error404(const char *page)
+pg_error_badrequest(const char *msg)
{
- resp_begin_html(404, "Not Found");
- puts("Page Not Found \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"
- "
");
+ resp_begin_html(400, "Bad Request");
+ puts("Bad Request \n"
+ "\n");
+ puts(msg);
+ printf("Try again from the\n"
+ "main page .\n"
+ "
", scriptname);
resp_end_html();
}
static void
-resp_bad(void)
+pg_error_internal(void)
{
resp_begin_html(500, "Internal Server Error");
- puts("Generic badness happened.
");
+ puts("Internal Server Error
");
resp_end_html();
}
static void
-resp_baddb(void)
+pg_searchres(const struct req *req, struct manpage *r, size_t sz)
{
+ size_t i, iuse, isec;
+ int prio, priouse;
+ char sec;
- resp_begin_html(500, "Internal Server Error");
- puts("Your database is broken.
");
- resp_end_html();
-}
-
-static void
-resp_search(struct res *r, size_t sz, void *arg)
-{
- int i;
-
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,
- r[0].volume, r[0].rec);
- puts("Content-Type: text/html; charset=utf-8\n");
+ 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);
+ printf("\r\n"
+ "Content-Type: text/html; charset=utf-8\r\n"
+ "\r\n");
return;
}
- resp_begin_http(200, NULL);
- puts("" "\n"
- "" "\n"
- " " "\n"
- " " "\n"
- " " "\n"
- " System Manpage Reference " "\n"
- " " "\n"
- " " "\n"
- "");
+ qsort(r, sz, sizeof(struct manpage), cmp);
- resp_searchform((const struct req *)arg);
+ resp_begin_html(200, NULL);
+ resp_searchform(req);
+ puts("");
+
+ /*
+ * In man(1) mode, show one of the pages
+ * even if more than one is found.
+ */
+
+ if (req->q.equal) {
+ puts(" ");
+ iuse = 0;
+ priouse = 10;
+ for (i = 0; i < sz; i++) {
+ isec = strcspn(r[i].file, "123456789");
+ sec = r[i].file[isec];
+ if ('\0' == sec)
+ continue;
+ prio = sec_prios[sec - '1'];
+ if (prio >= priouse)
+ continue;
+ priouse = prio;
+ iuse = i;
}
- printf(") ");
- html_print(r[i].desc);
- puts("
");
+ resp_show(req, r[iuse].file);
}
resp_end_html();
}
-/* ARGSUSED */
static void
-pg_index(const struct manpaths *ps, const struct req *req, char *path)
+catman(const struct req *req, const char *file)
{
-
- resp_index(req);
-}
-
-static void
-catman(const char *file)
-{
FILE *f;
size_t len;
int i;
@@ -480,13 +601,13 @@ catman(const char *file)
int italic, bold;
if (NULL == (f = fopen(file, "r"))) {
- resp_baddb();
+ puts("You specified an invalid manual file.
");
return;
}
- resp_begin_html(200, NULL);
+ puts("\n"
+ "
");
- puts("");
while (NULL != (p = fgetln(f, &len))) {
bold = italic = 0;
for (i = 0; i < (int)len - 1; i++) {
@@ -597,14 +718,13 @@ catman(const char *file)
}
puts(" \n"
- "\n"
- "");
+ " ");
fclose(f);
}
static void
-format(const char *file)
+format(const struct req *req, const char *file)
{
struct mparse *mp;
int fd;
@@ -612,147 +732,136 @@ format(const char *file)
struct man *man;
void *vp;
enum mandoclevel rc;
- char opts[MAXPATHLEN + 128];
+ char opts[PATH_MAX + 128];
if (-1 == (fd = open(file, O_RDONLY, 0))) {
- resp_baddb();
+ puts("You specified an invalid manual file.
");
return;
}
- mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
+ mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
+ req->q.manpath);
rc = mparse_readfd(mp, fd, file);
close(fd);
if (rc >= MANDOCLEVEL_FATAL) {
- resp_baddb();
+ fprintf(stderr, "fatal mandoc error: %s/%s\n",
+ req->q.manpath, file);
+ pg_error_internal();
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);
+ snprintf(opts, sizeof(opts),
+ "fragment,man=%s?query=%%N&sec=%%S",
+ scriptname);
- mparse_result(mp, &mdoc, &man);
+ mparse_result(mp, &mdoc, &man, NULL);
+ if (NULL == man && NULL == mdoc) {
+ fprintf(stderr, "fatal mandoc error: %s/%s\n",
+ req->q.manpath, file);
+ pg_error_internal();
+ mparse_free(mp);
+ return;
+ }
+
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();
html_free(vp);
mparse_free(mp);
}
static void
-pg_show(const struct manpaths *ps, const struct req *req, char *path)
+resp_show(const struct req *req, const char *file)
{
- char *sub;
- char file[MAXPATHLEN];
- const char *fn, *cp;
- int rc;
- unsigned int vol, rec;
- DB *idx;
- DBT key, val;
+ if ('.' == file[0] || '/' == file[1])
+ file += 2;
- if (NULL == path) {
- resp_error400();
- return;
- } else if (NULL == (sub = strrchr(path, '/'))) {
- resp_error400();
- return;
- } else
- *sub++ = '\0';
+ if ('c' == *file)
+ catman(req, file);
+ else
+ format(req, file);
+}
- if ( ! (atou(path, &vol) && atou(sub, &rec))) {
- resp_error400();
- return;
- } else if (vol >= (unsigned int)ps->sz) {
- resp_error400();
- return;
- }
+static void
+pg_show(const struct req *req, const char *path)
+{
+ char *sub;
- 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();
+ if (NULL == path || NULL == (sub = strchr(path, '/'))) {
+ pg_error_badrequest(
+ "You did not specify a page to show.");
return;
- }
-
- key.data = &rec;
- key.size = 4;
-
- if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) {
- rc < 0 ? resp_baddb() : resp_error400();
- goto out;
}
+ *sub++ = '\0';
- cp = (char *)val.data;
+ /*
+ * Begin by chdir()ing into the manpath.
+ * This way we can pick up the database files, which are
+ * relative to the manpath root.
+ */
- 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);
+ if (-1 == chdir(path)) {
+ pg_error_badrequest(
+ "You specified an invalid manpath.");
+ return;
}
-out:
- (*idx->close)(idx);
+
+ resp_begin_html(200, NULL);
+ resp_searchform(req);
+ resp_show(req, sub);
+ resp_end_html();
}
static void
-pg_search(const struct manpaths *ps, const struct req *req, char *path)
+pg_search(const struct req *req)
{
- size_t tt;
- int i, sz, rc;
- const char *ep, *start;
- char **cp;
- struct opts opt;
- struct expr *expr;
+ struct mansearch search;
+ struct manpaths paths;
+ struct manpage *res;
+ char **cp;
+ const char *ep, *start;
+ size_t ressz;
+ int i, sz;
- expr = NULL;
- cp = NULL;
- ep = NULL;
- sz = 0;
+ /*
+ * Begin by chdir()ing into the root of the manpath.
+ * This way we can pick up the database files, which are
+ * relative to the manpath root.
+ */
- memset(&opt, 0, sizeof(struct opts));
+ if (-1 == (chdir(req->q.manpath))) {
+ pg_error_badrequest(
+ "You specified an invalid manpath.");
+ return;
+ }
- 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;
+ search.arch = req->q.arch;
+ search.sec = req->q.sec;
+ 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 *));
+ paths.paths[0] = mandoc_strdup(".");
+
/*
- * Poor man's tokenisation.
- * Just break apart by spaces.
+ * Poor man's tokenisation: just break apart by spaces.
* Yes, this is half-ass. But it works for now.
*/
+ ep = req->q.expr;
while (ep && isspace((unsigned char)*ep))
ep++;
+ sz = 0;
+ cp = NULL;
while (ep && '\0' != *ep) {
- cp = mandoc_realloc(cp, (sz + 1) * sizeof(char *));
+ cp = mandoc_reallocarray(cp, sz + 1, sizeof(char *));
start = ep;
while ('\0' != *ep && ! isspace((unsigned char)*ep))
ep++;
@@ -763,119 +872,112 @@ pg_search(const struct manpaths *ps, const struct req
ep++;
}
- rc = -1;
+ if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz))
+ pg_noresult(req, "You entered an invalid query.");
+ else if (0 == ressz)
+ pg_noresult(req, "No results found.");
+ else
+ pg_searchres(req, res, ressz);
- /*
- * 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);
+
+ for (i = 0; i < (int)ressz; i++) {
+ free(res[i].file);
+ free(res[i].names);
+ free(res[i].output);
+ }
+ free(res);
+
+ free(paths.paths[0]);
+ free(paths.paths);
}
int
main(void)
{
- int i;
struct req req;
- char *p, *path, *subpath;
- struct manpaths paths;
+ const char *path;
+ char *querystring;
+ int i;
- /* HTTP init: read and parse the query string. */
+ /* Scan our run-time environment. */
- progname = getenv("SCRIPT_NAME");
- if (NULL == progname)
- progname = "";
+ if (NULL == (scriptname = getenv("SCRIPT_NAME")))
+ scriptname = "";
- cache = getenv("CACHE_DIR");
- if (NULL == cache)
- cache = "/cache/man.cgi";
+ if (NULL == (httphost = getenv("HTTP_HOST")))
+ httphost = "localhost";
- if (-1 == chdir(cache)) {
- resp_bad();
+ /*
+ * First we change directory into the MAN_DIR so that
+ * subsequent scanning for manpath directories is rooted
+ * relative to the same position.
+ */
+
+ if (-1 == chdir(MAN_DIR)) {
+ fprintf(stderr, "MAN_DIR: %s: %s\n",
+ MAN_DIR, strerror(errno));
+ pg_error_internal();
return(EXIT_FAILURE);
- }
+ }
- host = getenv("HTTP_HOST");
- if (NULL == host)
- host = "localhost";
-
memset(&req, 0, sizeof(struct req));
+ pathgen(&req);
- if (NULL != (p = getenv("QUERY_STRING")))
- kval_parse(&req.fields, &req.fieldsz, p);
+ /* Next parse out the query string. */
- /* Resolve leading subpath component. */
+ if (NULL != (querystring = getenv("QUERY_STRING")))
+ http_parse(&req, querystring);
- subpath = path = NULL;
- req.page = PAGE__MAX;
+ /* Dispatch to the three different pages. */
- if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path)
- req.page = PAGE_INDEX;
+ path = getenv("PATH_INFO");
+ if (NULL == path)
+ path = "";
+ else if ('/' == *path)
+ path++;
- if (NULL != path && '/' == *path && '\0' == *++path)
- req.page = PAGE_INDEX;
+ if ('\0' != *path)
+ pg_show(&req, path);
+ else if (NULL != req.q.expr)
+ pg_search(&req);
+ else
+ pg_index(&req);
- /* Strip file suffix. */
+ for (i = 0; i < (int)req.psz; i++)
+ free(req.p[i]);
+ free(req.p);
+ return(EXIT_SUCCESS);
+}
- if (NULL != path && NULL != (p = strrchr(path, '.')))
- if (NULL != p && NULL == strchr(p, '/'))
- *p++ = '\0';
+static int
+cmp(const void *p1, const void *p2)
+{
- /* Resolve subpath component. */
+ return(strcasecmp(((const struct manpage *)p1)->names,
+ ((const struct manpage *)p2)->names));
+}
- if (NULL != path && NULL != (subpath = strchr(path, '/')))
- *subpath++ = '\0';
+/*
+ * Scan for indexable paths.
+ */
+static void
+pathgen(struct req *req)
+{
+ FILE *fp;
+ char *dp;
+ size_t dpsz;
- /* Map path into one we recognise. */
+ if (NULL == (fp = fopen("manpath.conf", "r")))
+ return;
- 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;
- }
-
- /* Initialise MANPATH. */
-
- memset(&paths, 0, sizeof(struct manpaths));
- manpath_manconf("etc/catman.conf", &paths);
-
- /* Route pages. */
-
- switch (req.page) {
- case (PAGE_INDEX):
- pg_index(&paths, &req, subpath);
- break;
- case (PAGE_SEARCH):
- pg_search(&paths, &req, subpath);
- break;
- case (PAGE_SHOW):
- pg_show(&paths, &req, subpath);
- break;
- default:
- resp_error404(path);
- break;
+ while (NULL != (dp = fgetln(fp, &dpsz))) {
+ if ('\n' == dp[dpsz - 1])
+ dpsz--;
+ req->p = mandoc_realloc(req->p,
+ (req->psz + 1) * sizeof(char *));
+ req->p[req->psz++] = mandoc_strndup(dp, dpsz);
}
-
- manpath_free(&paths);
- kval_free(req.fields, req.fieldsz);
-
- return(EXIT_SUCCESS);
}