version 1.58, 2014/07/09 14:18:59 |
version 1.65, 2014/07/12 16:14:35 |
|
|
const char *arch; /* architecture */ |
const char *arch; /* architecture */ |
const char *sec; /* manual section */ |
const char *sec; /* manual section */ |
const char *expr; /* unparsed expression string */ |
const char *expr; /* unparsed expression string */ |
int legacy; /* whether legacy mode */ |
int equal; /* match whole names, not substrings */ |
}; |
}; |
|
|
struct req { |
struct req { |
Line 74 static void pathgen(struct req *); |
|
Line 74 static void pathgen(struct req *); |
|
static void pg_index(const struct req *, char *); |
static void pg_index(const struct req *, char *); |
static void pg_search(const struct req *, char *); |
static void pg_search(const struct req *, char *); |
static void pg_show(const struct req *, char *); |
static void pg_show(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 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_error_notfound(const char *); |
static void resp_index(const struct req *); |
static void resp_index(const struct req *); |
|
static void resp_noresult(const struct req *, |
|
const char *); |
static void resp_search(const struct req *, |
static void resp_search(const struct req *, |
struct manpage *, size_t); |
struct manpage *, size_t); |
static void resp_searchform(const struct req *); |
static void resp_searchform(const struct req *); |
Line 141 http_printquery(const struct req *req) |
|
Line 142 http_printquery(const struct req *req) |
|
http_print(req->q.arch); |
http_print(req->q.arch); |
} |
} |
if (NULL != req->q.expr) { |
if (NULL != req->q.expr) { |
printf("&expr="); |
printf("&query="); |
http_print(req->q.expr ? req->q.expr : ""); |
http_print(req->q.expr); |
} |
} |
|
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
} |
} |
|
|
static void |
static void |
Line 163 html_printquery(const struct req *req) |
|
Line 166 html_printquery(const struct req *req) |
|
html_print(req->q.arch); |
html_print(req->q.arch); |
} |
} |
if (NULL != req->q.expr) { |
if (NULL != req->q.expr) { |
printf("&expr="); |
printf("&query="); |
html_print(req->q.expr ? req->q.expr : ""); |
html_print(req->q.expr); |
} |
} |
|
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
} |
} |
|
|
static void |
static void |
|
|
http_parse(struct req *req, char *p) |
http_parse(struct req *req, char *p) |
{ |
{ |
char *key, *val; |
char *key, *val; |
int legacy; |
|
|
|
memset(&req->q, 0, sizeof(struct query)); |
memset(&req->q, 0, sizeof(struct query)); |
req->q.manpath = req->p[0]; |
req->q.manpath = req->p[0]; |
|
req->q.equal = 1; |
|
|
legacy = -1; |
|
while ('\0' != *p) { |
while ('\0' != *p) { |
key = p; |
key = p; |
val = NULL; |
val = NULL; |
Line 227 http_parse(struct req *req, char *p) |
|
Line 231 http_parse(struct req *req, char *p) |
|
if (NULL != val && ! http_decode(val)) |
if (NULL != val && ! http_decode(val)) |
break; |
break; |
|
|
if (0 == strcmp(key, "expr")) |
if (0 == strcmp(key, "query")) |
req->q.expr = val; |
req->q.expr = val; |
else if (0 == strcmp(key, "query")) |
|
req->q.expr = val; |
|
else if (0 == strcmp(key, "sec")) |
|
req->q.sec = val; |
|
else if (0 == strcmp(key, "sektion")) |
|
req->q.sec = val; |
|
else if (0 == strcmp(key, "arch")) |
|
req->q.arch = val; |
|
else if (0 == strcmp(key, "manpath")) |
else if (0 == strcmp(key, "manpath")) |
req->q.manpath = val; |
req->q.manpath = val; |
else if (0 == strcmp(key, "apropos")) |
else if (0 == strcmp(key, "apropos")) |
legacy = 0 == strcmp(val, "0"); |
req->q.equal = !strcmp(val, "0"); |
|
else if (0 == strcmp(key, "sec") || |
|
0 == strcmp(key, "sektion")) { |
|
if (strcmp(val, "0")) |
|
req->q.sec = val; |
|
} else if (0 == strcmp(key, "arch")) { |
|
if (strcmp(val, "default")) |
|
req->q.arch = val; |
|
} |
} |
} |
|
|
/* Test for old man.cgi compatibility mode. */ |
|
|
|
req->q.legacy = legacy > 0; |
|
|
|
/* |
|
* Section "0" means no section when in legacy mode. |
|
* For some man.cgi scripts, "default" arch is none. |
|
*/ |
|
|
|
if (req->q.legacy && NULL != req->q.sec) |
|
if (0 == strcmp(req->q.sec, "0")) |
|
req->q.sec = NULL; |
|
if (req->q.legacy && NULL != req->q.arch) |
|
if (0 == strcmp(req->q.arch, "default")) |
|
req->q.arch = NULL; |
|
} |
} |
|
|
static void |
static void |
|
|
http_decode(char *p) |
http_decode(char *p) |
{ |
{ |
char hex[3]; |
char hex[3]; |
|
char *q; |
int c; |
int c; |
|
|
hex[2] = '\0'; |
hex[2] = '\0'; |
|
|
for ( ; '\0' != *p; p++) { |
q = p; |
|
for ( ; '\0' != *p; p++, q++) { |
if ('%' == *p) { |
if ('%' == *p) { |
if ('\0' == (hex[0] = *(p + 1))) |
if ('\0' == (hex[0] = *(p + 1))) |
return(0); |
return(0); |
Line 298 http_decode(char *p) |
|
Line 288 http_decode(char *p) |
|
if ('\0' == c) |
if ('\0' == c) |
return(0); |
return(0); |
|
|
*p = (char)c; |
*q = (char)c; |
memmove(p + 1, p + 3, strlen(p + 3) + 1); |
p += 2; |
} else |
} else |
*p = '+' == *p ? ' ' : *p; |
*q = '+' == *p ? ' ' : *p; |
} |
} |
|
|
*p = '\0'; |
*q = '\0'; |
return(1); |
return(1); |
} |
} |
|
|
Line 313 resp_begin_http(int code, const char *msg) |
|
Line 303 resp_begin_http(int code, const char *msg) |
|
{ |
{ |
|
|
if (200 != code) |
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" |
printf("Content-Type: text/html; charset=utf-8\r\n" |
"Cache-Control: no-cache\n" |
"Cache-Control: no-cache\r\n" |
"Pragma: no-cache\n" |
"Pragma: no-cache\r\n" |
""); |
"\r\n"); |
|
|
fflush(stdout); |
fflush(stdout); |
} |
} |
Line 365 resp_searchform(const struct req *req) |
|
Line 355 resp_searchform(const struct req *req) |
|
"<FORM ACTION=\"%s/search\" METHOD=\"get\">\n" |
"<FORM ACTION=\"%s/search\" METHOD=\"get\">\n" |
"<FIELDSET>\n" |
"<FIELDSET>\n" |
"<LEGEND>Search Parameters</LEGEND>\n" |
"<LEGEND>Search Parameters</LEGEND>\n" |
"<INPUT TYPE=\"submit\" " |
"<INPUT TYPE=\"submit\" VALUE=\"Search\"> " |
" VALUE=\"Search\"> for manuals satisfying \n" |
"for manuals \n", |
"<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"", |
|
scriptname); |
scriptname); |
|
printf("<SELECT NAME=\"apropos\">\n" |
|
"<OPTION VALUE=\"0\""); |
|
if (req->q.equal) |
|
printf(" SELECTED=\"selected\""); |
|
printf(">named</OPTION>\n" |
|
"<OPTION VALUE=\"1\""); |
|
if (0 == req->q.equal) |
|
printf(" SELECTED=\"selected\""); |
|
printf(">matching</OPTION>\n" |
|
"</SELECT>\n" |
|
"<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\""); |
html_print(req->q.expr ? req->q.expr : ""); |
html_print(req->q.expr ? req->q.expr : ""); |
printf("\">, section " |
printf("\">, section " |
"<INPUT TYPE=\"text\"" |
"<INPUT TYPE=\"text\"" |
Line 380 resp_searchform(const struct req *req) |
|
Line 380 resp_searchform(const struct req *req) |
|
html_print(req->q.arch ? req->q.arch : ""); |
html_print(req->q.arch ? req->q.arch : ""); |
printf("\">"); |
printf("\">"); |
if (req->psz > 1) { |
if (req->psz > 1) { |
puts(", <SELECT NAME=\"manpath\">"); |
puts(", in <SELECT NAME=\"manpath\">"); |
for (i = 0; i < (int)req->psz; i++) { |
for (i = 0; i < (int)req->psz; i++) { |
printf("<OPTION "); |
printf("<OPTION "); |
if (NULL == req->q.manpath ? 0 == i : |
if (NULL == req->q.manpath ? 0 == i : |
Line 394 resp_searchform(const struct req *req) |
|
Line 394 resp_searchform(const struct req *req) |
|
} |
} |
puts("</SELECT>"); |
puts("</SELECT>"); |
} |
} |
puts(".\n" |
puts("—\n" |
"<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n" |
"<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n" |
"</FIELDSET>\n" |
"</FIELDSET>\n" |
"</FORM>\n" |
"</FORM>\n" |
Line 407 resp_index(const struct req *req) |
|
Line 407 resp_index(const struct req *req) |
|
{ |
{ |
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
|
puts("<H1>\n" |
|
"Online manuals with " |
|
"<A HREF=\"http://mdocml.bsd.lv/\">mandoc</A>\n" |
|
"</H1>"); |
resp_searchform(req); |
resp_searchform(req); |
|
printf("<P>\n" |
|
"This web interface is documented in the " |
|
"<A HREF=\"%s/search?expr=Nm~^man\\.cgi$&sec=8\">" |
|
"man.cgi</A> manual, and the " |
|
"<A HREF=\"%s/search?expr=Nm~^apropos$&sec=1\">" |
|
"apropos</A> manual explains the query syntax.\n" |
|
"</P>\n", |
|
scriptname, scriptname); |
resp_end_html(); |
resp_end_html(); |
} |
} |
|
|
static void |
static void |
resp_error400(void) |
resp_noresult(const struct req *req, const char *msg) |
{ |
{ |
|
resp_begin_html(200, NULL); |
|
resp_searchform(req); |
|
puts("<P>"); |
|
puts(msg); |
|
puts("</P>"); |
|
resp_end_html(); |
|
} |
|
|
resp_begin_html(400, "Query Malformed"); |
static void |
printf("<H1>Malformed Query</H1>\n" |
resp_error_badrequest(const char *msg) |
"<P>\n" |
{ |
"The query your entered was malformed.\n" |
|
"Try again from the\n" |
resp_begin_html(400, "Bad Request"); |
"<A HREF=\"%s/index.html\">main page</A>.\n" |
puts("<H1>Bad Request</H1>\n" |
|
"<P>\n"); |
|
puts(msg); |
|
printf("Try again from the\n" |
|
"<A HREF=\"%s\">main page</A>.\n" |
"</P>", scriptname); |
"</P>", scriptname); |
resp_end_html(); |
resp_end_html(); |
} |
} |
|
|
static void |
static void |
resp_error404(const char *page) |
resp_error_notfound(const char *page) |
{ |
{ |
|
|
resp_begin_html(404, "Not Found"); |
resp_begin_html(404, "Not Found"); |
Line 444 resp_error404(const char *page) |
|
Line 467 resp_error404(const char *page) |
|
} |
} |
|
|
static void |
static void |
resp_bad(void) |
resp_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>"); |
|
|
} |
} |
|
|
static void |
static void |
resp_baddb(void) |
|
{ |
|
|
|
resp_begin_html(500, "Internal Server Error"); |
|
puts("<P>Your database is broken.</P>"); |
|
resp_end_html(); |
|
} |
|
|
|
static void |
|
resp_search(const struct req *req, struct manpage *r, size_t sz) |
resp_search(const struct req *req, struct manpage *r, size_t sz) |
{ |
{ |
size_t i; |
size_t i; |
Line 470 resp_search(const struct req *req, struct manpage *r, |
|
Line 484 resp_search(const struct req *req, struct manpage *r, |
|
* 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"); |
printf("Status: 303 See Other\r\n"); |
printf("Location: http://%s%s/show/%s/%s?", |
printf("Location: http://%s%s/show/%s/%s?", |
httphost, scriptname, req->q.manpath, r[0].file); |
httphost, scriptname, req->q.manpath, r[0].file); |
http_printquery(req); |
http_printquery(req); |
puts("\n" |
printf("\r\n" |
"Content-Type: text/html; charset=utf-8\n"); |
"Content-Type: text/html; charset=utf-8\r\n" |
|
"\r\n"); |
return; |
return; |
} |
} |
|
|
|
qsort(r, sz, sizeof(struct manpage), cmp); |
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
|
|
puts("<DIV CLASS=\"results\">"); |
puts("<DIV CLASS=\"results\">"); |
|
|
if (0 == sz) { |
|
puts("<P>\n" |
|
"No results found.\n" |
|
"</P>\n" |
|
"</DIV>"); |
|
resp_end_html(); |
|
return; |
|
} |
|
|
|
qsort(r, sz, sizeof(struct manpage), cmp); |
|
|
|
puts("<TABLE>"); |
puts("<TABLE>"); |
|
|
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
Line 536 catman(const struct req *req, const char *file) |
|
Line 540 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_baddb(); |
resp_error_badrequest( |
|
"You specified an invalid manual file."); |
return; |
return; |
} |
} |
|
|
Line 674 format(const struct req *req, const char *file) |
|
Line 679 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_baddb(); |
resp_error_badrequest( |
|
"You specified an invalid manual file."); |
return; |
return; |
} |
} |
|
|
Line 684 format(const struct req *req, const char *file) |
|
Line 690 format(const struct req *req, const char *file) |
|
close(fd); |
close(fd); |
|
|
if (rc >= MANDOCLEVEL_FATAL) { |
if (rc >= MANDOCLEVEL_FATAL) { |
resp_baddb(); |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
|
req->q.manpath, file); |
|
resp_error_internal(); |
return; |
return; |
} |
} |
|
|
Line 694 format(const struct req *req, const char *file) |
|
Line 702 format(const struct req *req, const char *file) |
|
|
|
mparse_result(mp, &mdoc, &man, NULL); |
mparse_result(mp, &mdoc, &man, NULL); |
if (NULL == man && NULL == mdoc) { |
if (NULL == man && NULL == mdoc) { |
resp_baddb(); |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
|
req->q.manpath, file); |
|
resp_error_internal(); |
mparse_free(mp); |
mparse_free(mp); |
return; |
return; |
} |
} |
Line 722 pg_show(const struct req *req, char *path) |
|
Line 732 pg_show(const struct req *req, char *path) |
|
char *sub; |
char *sub; |
|
|
if (NULL == path || NULL == (sub = strchr(path, '/'))) { |
if (NULL == path || NULL == (sub = strchr(path, '/'))) { |
resp_error400(); |
resp_error_badrequest( |
|
"You did not specify a page to show."); |
return; |
return; |
} |
} |
*sub++ = '\0'; |
*sub++ = '\0'; |
Line 734 pg_show(const struct req *req, char *path) |
|
Line 745 pg_show(const struct req *req, char *path) |
|
*/ |
*/ |
|
|
if (-1 == chdir(path)) { |
if (-1 == chdir(path)) { |
perror(path); |
resp_error_badrequest( |
resp_baddb(); |
"You specified an invalid manpath."); |
return; |
return; |
} |
} |
|
|
Line 763 pg_search(const struct req *req, char *path) |
|
Line 774 pg_search(const struct req *req, char *path) |
|
*/ |
*/ |
|
|
if (-1 == (chdir(req->q.manpath))) { |
if (-1 == (chdir(req->q.manpath))) { |
perror(req->q.manpath); |
resp_error_badrequest( |
resp_search(req, NULL, 0); |
"You specified an invalid manpath."); |
return; |
return; |
} |
} |
|
|
search.arch = req->q.arch; |
search.arch = req->q.arch; |
search.sec = req->q.sec; |
search.sec = req->q.sec; |
search.deftype = TYPE_Nm | TYPE_Nd; |
search.deftype = req->q.equal ? TYPE_Nm : (TYPE_Nm | TYPE_Nd); |
search.flags = 0; |
search.flags = req->q.equal ? MANSEARCH_MAN : 0; |
|
|
paths.sz = 1; |
paths.sz = 1; |
paths.paths = mandoc_malloc(sizeof(char *)); |
paths.paths = mandoc_malloc(sizeof(char *)); |
Line 800 pg_search(const struct req *req, char *path) |
|
Line 811 pg_search(const struct req *req, char *path) |
|
ep++; |
ep++; |
} |
} |
|
|
if (mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) |
if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) |
resp_search(req, res, ressz); |
resp_noresult(req, "You entered an invalid query."); |
|
else if (0 == ressz) |
|
resp_noresult(req, "No results found."); |
else |
else |
resp_baddb(); |
resp_search(req, res, ressz); |
|
|
for (i = 0; i < sz; i++) |
for (i = 0; i < sz; i++) |
free(cp[i]); |
free(cp[i]); |
|
|
if (-1 == chdir(mandir)) { |
if (-1 == chdir(mandir)) { |
fprintf(stderr, "MAN_DIR: %s: %s\n", |
fprintf(stderr, "MAN_DIR: %s: %s\n", |
mandir, strerror(errno)); |
mandir, strerror(errno)); |
resp_bad(); |
resp_error_internal(); |
return(EXIT_FAILURE); |
return(EXIT_FAILURE); |
} |
} |
|
|
|
|
pg_show(&req, subpath); |
pg_show(&req, subpath); |
break; |
break; |
default: |
default: |
resp_error404(path); |
resp_error_notfound(path); |
break; |
break; |
} |
} |
|
|