version 1.32, 2011/12/15 12:05:19 |
version 1.36, 2011/12/16 18:37:12 |
Line 84 static void catman(const struct req *, const char *) |
|
Line 84 static void catman(const struct req *, const char *) |
|
static int cmp(const void *, const void *); |
static int cmp(const void *, const void *); |
static void format(const struct req *, const char *); |
static void format(const struct req *, const char *); |
static void html_print(const char *); |
static void html_print(const char *); |
|
static void html_printquery(const struct req *); |
static void html_putchar(char); |
static void html_putchar(char); |
static int http_decode(char *); |
static int http_decode(char *); |
static void http_parse(struct req *, 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 int pathstop(DIR *); |
static void pathgen(DIR *, char *, struct req *); |
static void pathgen(DIR *, char *, struct req *); |
static void pg_index(const struct req *, char *); |
static void pg_index(const struct req *, char *); |
Line 163 html_putchar(char c) |
|
Line 167 html_putchar(char c) |
|
break; |
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(). |
* Call through to html_putchar(). |
* Accepts NULL strings. |
* Accepts NULL strings. |
|
|
http_parse(struct req *req, char *p) |
http_parse(struct req *req, char *p) |
{ |
{ |
char *key, *val, *manroot; |
char *key, *val, *manroot; |
size_t sz; |
|
int i, legacy; |
int i, legacy; |
|
|
memset(&req->q, 0, sizeof(struct query)); |
memset(&req->q, 0, sizeof(struct query)); |
Line 196 http_parse(struct req *req, char *p) |
|
Line 233 http_parse(struct req *req, char *p) |
|
legacy = -1; |
legacy = -1; |
manroot = NULL; |
manroot = NULL; |
|
|
while (p && '\0' != *p) { |
while ('\0' != *p) { |
while (' ' == *p) |
|
p++; |
|
|
|
key = p; |
key = p; |
val = NULL; |
val = NULL; |
|
|
if (NULL != (p = strchr(p, '='))) { |
p += (int)strcspn(p, ";&"); |
|
if ('\0' != *p) |
*p++ = '\0'; |
*p++ = '\0'; |
val = p; |
if (NULL != (val = strchr(key, '='))) |
|
*val++ = '\0'; |
|
|
sz = strcspn(p, ";&"); |
if ('\0' == *key || NULL == val || '\0' == *val) |
/* LINTED */ |
|
p += sz; |
|
|
|
if ('\0' != *p) |
|
*p++ = '\0'; |
|
} else { |
|
p = key; |
|
sz = strcspn(p, ";&"); |
|
/* LINTED */ |
|
p += sz; |
|
|
|
if ('\0' != *p) |
|
p++; |
|
continue; |
continue; |
} |
|
|
|
if ('\0' == *key || '\0' == *val) |
|
continue; |
|
|
|
/* Just abort handling. */ |
/* Just abort handling. */ |
|
|
if ( ! http_decode(key)) |
if ( ! http_decode(key)) |
break; |
break; |
if ( ! http_decode(val)) |
if (NULL != val && ! http_decode(val)) |
break; |
break; |
|
|
if (0 == strcmp(key, "expr")) |
if (0 == strcmp(key, "expr")) |
Line 284 http_parse(struct req *req, char *p) |
|
Line 303 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 |
* 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 |
* "%4e+foo" into "n foo" in the regular way. This is done in-place |
Line 478 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 511 resp_search(struct res *r, size_t sz, void *arg) |
|
|
|
req = (const struct req *)arg; |
req = (const struct req *)arg; |
assert(req->q.manroot >= 0); |
assert(req->q.manroot >= 0); |
|
|
if (1 == sz) { |
if (1 == sz) { |
/* |
/* |
* If we have just one result, then jump there now |
* If we have just one result, then jump there now |
* without any delay. |
* without any delay. |
*/ |
*/ |
puts("Status: 303 See Other"); |
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, |
host, progname, req->q.manroot, |
r[0].volume, r[0].rec); |
r[0].volume, r[0].rec); |
puts("Content-Type: text/html; charset=utf-8\n"); |
http_printquery(req); |
|
puts("\n" |
|
"Content-Type: text/html; charset=utf-8\n"); |
return; |
return; |
} |
} |
|
|
Line 497 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 532 resp_search(struct res *r, size_t sz, void *arg) |
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
|
|
|
puts("<DIV CLASS=\"results\">"); |
|
|
if (0 == sz) { |
if (0 == sz) { |
printf("<P>\n" |
printf("<P>\n" |
"No %s results found.\n", |
"No %s results found.\n", |
req->q.whatis ? "whatis" : "apropos"); |
req->q.whatis ? "whatis" : "apropos"); |
if (req->q.whatis) { |
if (req->q.whatis) { |
printf("(Try <A HREF=\"%s/search.html?" |
printf("(Try " |
"op=apropos&expr=", progname); |
"<A HREF=\"%s/search.html?op=apropos", |
html_print(req->q.expr ? req->q.expr : ""); |
progname); |
printf("&sec="); |
html_printquery(req); |
html_print(req->q.sec ? req->q.sec : ""); |
|
printf("&arch="); |
|
html_print(req->q.arch ? req->q.arch : ""); |
|
puts("\">apropos</A>?)"); |
puts("\">apropos</A>?)"); |
} |
} |
puts("</P>"); |
puts("</P>"); |
|
puts("</DIV>"); |
resp_end_html(); |
resp_end_html(); |
return; |
return; |
} |
} |
|
|
puts("<P></P>\n" |
puts("<TABLE>"); |
"<TABLE>"); |
|
|
|
for (i = 0; i < (int)sz; i++) { |
for (i = 0; i < (int)sz; i++) { |
printf("<TR>\n" |
printf("<TR>\n" |
"<TD CLASS=\"title\">\n" |
"<TD CLASS=\"title\">\n" |
"<A HREF=\"%s/show/%d/%u/%u.html\">", |
"<A HREF=\"%s/show/%d/%u/%u.html?", |
progname, req->q.manroot, |
progname, req->q.manroot, |
r[i].volume, r[i].rec); |
r[i].volume, r[i].rec); |
|
html_printquery(req); |
|
printf("\">"); |
html_print(r[i].title); |
html_print(r[i].title); |
putchar('('); |
putchar('('); |
html_print(r[i].cat); |
html_print(r[i].cat); |
Line 540 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 576 resp_search(struct res *r, size_t sz, void *arg) |
|
"</TR>"); |
"</TR>"); |
} |
} |
|
|
puts("</TABLE>"); |
puts("</TABLE>\n" |
|
"</DIV>"); |
resp_end_html(); |
resp_end_html(); |
} |
} |
|
|
|
|
pg_show(const struct req *req, char *path) |
pg_show(const struct req *req, char *path) |
{ |
{ |
struct manpaths ps; |
struct manpaths ps; |
|
size_t sz; |
char *sub; |
char *sub; |
char file[MAXPATHLEN]; |
char file[MAXPATHLEN]; |
const char *fn, *cp; |
const char *cp; |
int rc; |
int rc, catm; |
unsigned int vol, rec, mr; |
unsigned int vol, rec, mr; |
DB *idx; |
DB *idx; |
DBT key, val; |
DBT key, val; |
Line 801 pg_show(const struct req *req, char *path) |
|
Line 839 pg_show(const struct req *req, char *path) |
|
goto out; |
goto out; |
} |
} |
|
|
strlcpy(file, ps.paths[vol], MAXPATHLEN); |
sz = strlcpy(file, ps.paths[vol], MAXPATHLEN); |
|
assert(sz < MAXPATHLEN); |
strlcat(file, "/mandoc.index", MAXPATHLEN); |
strlcat(file, "/mandoc.index", MAXPATHLEN); |
|
|
/* Open the index recno(3) database. */ |
/* Open the index recno(3) database. */ |
Line 819 pg_show(const struct req *req, char *path) |
|
Line 858 pg_show(const struct req *req, char *path) |
|
if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) { |
if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) { |
rc < 0 ? resp_baddb() : resp_error400(); |
rc < 0 ? resp_baddb() : resp_error400(); |
goto out; |
goto out; |
} |
} else if (0 == val.size) { |
|
resp_baddb(); |
|
goto out; |
|
} |
|
|
cp = (char *)val.data; |
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(); |
resp_baddb(); |
else if (++fn - cp >= (int)val.size) |
|
resp_baddb(); |
|
else if (NULL == memchr(fn, '\0', val.size - (fn - cp))) |
|
resp_baddb(); |
|
else { |
else { |
if (0 == strcmp(cp, "cat")) |
file[(int)sz] = '\0'; |
catman(req, fn + 1); |
strlcat(file, "/", MAXPATHLEN); |
|
strlcat(file, cp, MAXPATHLEN); |
|
if (catm) |
|
catman(req, file); |
else |
else |
format(req, fn + 1); |
format(req, file); |
} |
} |
out: |
out: |
if (idx) |
if (idx) |