version 1.69, 2014/07/13 09:39:32 |
version 1.74, 2014/07/18 14:46:25 |
Line 64 static void http_print(const char *); |
|
Line 64 static void http_print(const char *); |
|
static void http_putchar(char); |
static void http_putchar(char); |
static void http_printquery(const struct req *); |
static void http_printquery(const struct req *); |
static void pathgen(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_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 pg_show(const struct req *, const char *); |
static void resp_begin_html(int, const char *); |
static void resp_begin_html(int, const char *); |
static void resp_begin_http(int, const char *); |
static void resp_begin_http(int, const char *); |
static void resp_end_html(void); |
static void resp_end_html(void); |
static void resp_error_badrequest(const char *); |
|
static void resp_error_internal(void); |
|
static void resp_index(const struct req *); |
|
static void resp_noresult(const struct req *, |
|
const char *); |
|
static void resp_search(const struct req *, |
|
struct manpage *, size_t); |
|
static void resp_searchform(const struct req *); |
static void resp_searchform(const struct req *); |
|
static void resp_show(const struct req *, const char *); |
|
|
static const char *scriptname; /* CGI script name */ |
static const char *scriptname; /* CGI script name */ |
static const char *httphost; /* hostname used in the URIs */ |
static const char *httphost; /* hostname used in the URIs */ |
|
|
|
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
static const char *const sec_numbers[] = { |
static const char *const sec_numbers[] = { |
"0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9" |
"0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9" |
}; |
}; |
Line 249 http_parse(struct req *req, char *p) |
|
Line 250 http_parse(struct req *req, char *p) |
|
|
|
if (0 == strcmp(key, "query")) |
if (0 == strcmp(key, "query")) |
req->q.expr = val; |
req->q.expr = val; |
else if (0 == strcmp(key, "manpath")) |
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; |
req->q.manpath = val; |
else if (0 == strcmp(key, "apropos")) |
} else if (0 == strcmp(key, "apropos")) |
req->q.equal = !strcmp(val, "0"); |
req->q.equal = !strcmp(val, "0"); |
else if (0 == strcmp(key, "sec") || |
else if (0 == strcmp(key, "sec")) { |
0 == strcmp(key, "sektion")) { |
|
if (strcmp(val, "0")) |
if (strcmp(val, "0")) |
req->q.sec = val; |
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")) { |
} else if (0 == strcmp(key, "arch")) { |
if (strcmp(val, "default")) |
if (strcmp(val, "default")) |
req->q.arch = val; |
req->q.arch = val; |
Line 456 resp_searchform(const struct req *req) |
|
Line 468 resp_searchform(const struct req *req) |
|
} |
} |
|
|
static void |
static void |
resp_index(const struct req *req) |
pg_index(const struct req *req) |
{ |
{ |
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
Line 473 resp_index(const struct req *req) |
|
Line 485 resp_index(const struct req *req) |
|
} |
} |
|
|
static void |
static void |
resp_noresult(const struct req *req, const char *msg) |
pg_noresult(const struct req *req, const char *msg) |
{ |
{ |
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
Line 484 resp_noresult(const struct req *req, const char *msg) |
|
Line 496 resp_noresult(const struct req *req, const char *msg) |
|
} |
} |
|
|
static void |
static void |
resp_error_badrequest(const char *msg) |
pg_error_badrequest(const char *msg) |
{ |
{ |
|
|
resp_begin_html(400, "Bad Request"); |
resp_begin_html(400, "Bad Request"); |
Line 498 resp_error_badrequest(const char *msg) |
|
Line 510 resp_error_badrequest(const char *msg) |
|
} |
} |
|
|
static void |
static void |
resp_error_internal(void) |
pg_error_internal(void) |
{ |
{ |
resp_begin_html(500, "Internal Server Error"); |
resp_begin_html(500, "Internal Server Error"); |
puts("<P>Internal Server Error</P>"); |
puts("<P>Internal Server Error</P>"); |
Line 506 resp_error_internal(void) |
|
Line 518 resp_error_internal(void) |
|
} |
} |
|
|
static void |
static void |
resp_search(const struct req *req, struct manpage *r, size_t sz) |
pg_searchres(const struct req *req, struct manpage *r, size_t sz) |
{ |
{ |
size_t i; |
size_t i, iuse, isec; |
|
int prio, priouse; |
|
char sec; |
|
|
if (1 == sz) { |
if (1 == sz) { |
/* |
/* |
Line 550 resp_search(const struct req *req, struct manpage *r, |
|
Line 564 resp_search(const struct req *req, struct manpage *r, |
|
|
|
puts("</TABLE>\n" |
puts("</TABLE>\n" |
"</DIV>"); |
"</DIV>"); |
|
|
|
/* |
|
* In man(1) mode, show one of the pages |
|
* even if more than one is found. |
|
*/ |
|
|
|
if (req->q.equal) { |
|
puts("<HR>"); |
|
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; |
|
} |
|
resp_show(req, r[iuse].file); |
|
} |
|
|
resp_end_html(); |
resp_end_html(); |
} |
} |
|
|
Line 563 catman(const struct req *req, const char *file) |
|
Line 601 catman(const struct req *req, const char *file) |
|
int italic, bold; |
int italic, bold; |
|
|
if (NULL == (f = fopen(file, "r"))) { |
if (NULL == (f = fopen(file, "r"))) { |
resp_error_badrequest( |
puts("<P>You specified an invalid manual file.</P>"); |
"You specified an invalid manual file."); |
|
return; |
return; |
} |
} |
|
|
resp_begin_html(200, NULL); |
|
resp_searchform(req); |
|
puts("<DIV CLASS=\"catman\">\n" |
puts("<DIV CLASS=\"catman\">\n" |
"<PRE>"); |
"<PRE>"); |
|
|
Line 683 catman(const struct req *req, const char *file) |
|
Line 718 catman(const struct req *req, const char *file) |
|
} |
} |
|
|
puts("</PRE>\n" |
puts("</PRE>\n" |
"</DIV>\n" |
"</DIV>"); |
"</BODY>\n" |
|
"</HTML>"); |
|
|
|
fclose(f); |
fclose(f); |
} |
} |
Line 702 format(const struct req *req, const char *file) |
|
Line 735 format(const struct req *req, const char *file) |
|
char opts[PATH_MAX + 128]; |
char opts[PATH_MAX + 128]; |
|
|
if (-1 == (fd = open(file, O_RDONLY, 0))) { |
if (-1 == (fd = open(file, O_RDONLY, 0))) { |
resp_error_badrequest( |
puts("<P>You specified an invalid manual file.</P>"); |
"You specified an invalid manual file."); |
|
return; |
return; |
} |
} |
|
|
Line 715 format(const struct req *req, const char *file) |
|
Line 747 format(const struct req *req, const char *file) |
|
if (rc >= MANDOCLEVEL_FATAL) { |
if (rc >= MANDOCLEVEL_FATAL) { |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
req->q.manpath, file); |
req->q.manpath, file); |
resp_error_internal(); |
pg_error_internal(); |
return; |
return; |
} |
} |
|
|
Line 727 format(const struct req *req, const char *file) |
|
Line 759 format(const struct req *req, const char *file) |
|
if (NULL == man && NULL == mdoc) { |
if (NULL == man && NULL == mdoc) { |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
req->q.manpath, file); |
req->q.manpath, file); |
resp_error_internal(); |
pg_error_internal(); |
mparse_free(mp); |
mparse_free(mp); |
return; |
return; |
} |
} |
|
|
resp_begin_html(200, NULL); |
|
resp_searchform(req); |
|
|
|
vp = html_alloc(opts); |
vp = html_alloc(opts); |
|
|
if (NULL != mdoc) |
if (NULL != mdoc) |
Line 742 format(const struct req *req, const char *file) |
|
Line 771 format(const struct req *req, const char *file) |
|
else |
else |
html_man(vp, man); |
html_man(vp, man); |
|
|
puts("</BODY>\n" |
|
"</HTML>"); |
|
|
|
html_free(vp); |
html_free(vp); |
mparse_free(mp); |
mparse_free(mp); |
} |
} |
|
|
static void |
static void |
|
resp_show(const struct req *req, const char *file) |
|
{ |
|
if ('.' == file[0] || '/' == file[1]) |
|
file += 2; |
|
|
|
if ('c' == *file) |
|
catman(req, file); |
|
else |
|
format(req, file); |
|
} |
|
|
|
static void |
pg_show(const struct req *req, const char *path) |
pg_show(const struct req *req, const char *path) |
{ |
{ |
char *sub; |
char *sub; |
|
|
if (NULL == path || NULL == (sub = strchr(path, '/'))) { |
if (NULL == path || NULL == (sub = strchr(path, '/'))) { |
resp_error_badrequest( |
pg_error_badrequest( |
"You did not specify a page to show."); |
"You did not specify a page to show."); |
return; |
return; |
} |
} |
Line 768 pg_show(const struct req *req, const char *path) |
|
Line 806 pg_show(const struct req *req, const char *path) |
|
*/ |
*/ |
|
|
if (-1 == chdir(path)) { |
if (-1 == chdir(path)) { |
resp_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid manpath."); |
"You specified an invalid manpath."); |
return; |
return; |
} |
} |
|
|
if ('c' == *sub) |
resp_begin_html(200, NULL); |
catman(req, sub); |
resp_searchform(req); |
else |
resp_show(req, sub); |
format(req, sub); |
resp_end_html(); |
} |
} |
|
|
static void |
static void |
Line 797 pg_search(const struct req *req) |
|
Line 835 pg_search(const struct req *req) |
|
*/ |
*/ |
|
|
if (-1 == (chdir(req->q.manpath))) { |
if (-1 == (chdir(req->q.manpath))) { |
resp_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid manpath."); |
"You specified an invalid manpath."); |
return; |
return; |
} |
} |
Line 835 pg_search(const struct req *req) |
|
Line 873 pg_search(const struct req *req) |
|
} |
} |
|
|
if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) |
if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) |
resp_noresult(req, "You entered an invalid query."); |
pg_noresult(req, "You entered an invalid query."); |
else if (0 == ressz) |
else if (0 == ressz) |
resp_noresult(req, "No results found."); |
pg_noresult(req, "No results found."); |
else |
else |
resp_search(req, res, ressz); |
pg_searchres(req, res, ressz); |
|
|
for (i = 0; i < sz; i++) |
for (i = 0; i < sz; i++) |
free(cp[i]); |
free(cp[i]); |
|
|
if (-1 == chdir(MAN_DIR)) { |
if (-1 == chdir(MAN_DIR)) { |
fprintf(stderr, "MAN_DIR: %s: %s\n", |
fprintf(stderr, "MAN_DIR: %s: %s\n", |
MAN_DIR, strerror(errno)); |
MAN_DIR, strerror(errno)); |
resp_error_internal(); |
pg_error_internal(); |
return(EXIT_FAILURE); |
return(EXIT_FAILURE); |
} |
} |
|
|
|
|
else if (NULL != req.q.expr) |
else if (NULL != req.q.expr) |
pg_search(&req); |
pg_search(&req); |
else |
else |
resp_index(&req); |
pg_index(&req); |
|
|
for (i = 0; i < (int)req.psz; i++) |
for (i = 0; i < (int)req.psz; i++) |
free(req.p[i]); |
free(req.p[i]); |
Line 932 pathgen(struct req *req) |
|
Line 970 pathgen(struct req *req) |
|
char *dp; |
char *dp; |
size_t dpsz; |
size_t dpsz; |
|
|
if (NULL == (fp = fopen("manpath.conf", "r"))) |
if (NULL == (fp = fopen("manpath.conf", "r"))) { |
return; |
fprintf(stderr, "%s/manpath.conf: %s\n", |
|
MAN_DIR, strerror(errno)); |
|
pg_error_internal(); |
|
exit(EXIT_FAILURE); |
|
} |
|
|
while (NULL != (dp = fgetln(fp, &dpsz))) { |
while (NULL != (dp = fgetln(fp, &dpsz))) { |
if ('\n' == dp[dpsz - 1]) |
if ('\n' == dp[dpsz - 1]) |
Line 941 pathgen(struct req *req) |
|
Line 983 pathgen(struct req *req) |
|
req->p = mandoc_realloc(req->p, |
req->p = mandoc_realloc(req->p, |
(req->psz + 1) * sizeof(char *)); |
(req->psz + 1) * sizeof(char *)); |
req->p[req->psz++] = mandoc_strndup(dp, dpsz); |
req->p[req->psz++] = mandoc_strndup(dp, dpsz); |
|
} |
|
|
|
if ( req->p == NULL ) { |
|
fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR); |
|
pg_error_internal(); |
|
exit(EXIT_FAILURE); |
} |
} |
} |
} |