version 1.84, 2014/07/25 16:43:37 |
version 1.88, 2014/07/25 18:20:39 |
|
|
char *manpath; /* desired manual directory */ |
char *manpath; /* desired manual directory */ |
char *arch; /* architecture */ |
char *arch; /* architecture */ |
char *sec; /* manual section */ |
char *sec; /* manual section */ |
char *expr; /* unparsed expression string */ |
char *query; /* unparsed query expression */ |
int equal; /* match whole names, not substrings */ |
int equal; /* match whole names, not substrings */ |
}; |
}; |
|
|
Line 76 static void resp_begin_http(int, const char *); |
|
Line 76 static void resp_begin_http(int, const char *); |
|
static void resp_end_html(void); |
static void resp_end_html(void); |
static void resp_searchform(const struct req *); |
static void resp_searchform(const struct req *); |
static void resp_show(const struct req *, const char *); |
static void resp_show(const struct req *, const char *); |
|
static void set_query_attr(char **, char **); |
|
static int validate_filename(const char *); |
|
static int validate_manpath(const struct req *, const char *); |
|
static int validate_urifrag(const char *); |
|
|
static const char *scriptname; /* CGI script name */ |
static const char *scriptname; /* CGI script name */ |
|
|
|
|
http_printquery(const struct req *req) |
http_printquery(const struct req *req) |
{ |
{ |
|
|
if (NULL != req->q.manpath) { |
if (NULL != req->q.query) { |
printf("&manpath="); |
printf("query="); |
http_print(req->q.manpath); |
http_print(req->q.query); |
} |
} |
|
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
if (NULL != req->q.sec) { |
if (NULL != req->q.sec) { |
printf("&sec="); |
printf("&sec="); |
http_print(req->q.sec); |
http_print(req->q.sec); |
Line 156 http_printquery(const struct req *req) |
|
Line 162 http_printquery(const struct req *req) |
|
printf("&arch="); |
printf("&arch="); |
http_print(req->q.arch); |
http_print(req->q.arch); |
} |
} |
if (NULL != req->q.expr) { |
if (NULL != req->q.manpath && |
printf("&query="); |
strcmp(req->q.manpath, req->p[0])) { |
http_print(req->q.expr); |
printf("&manpath="); |
|
http_print(req->q.manpath); |
} |
} |
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
|
} |
} |
|
|
static void |
static void |
html_printquery(const struct req *req) |
html_printquery(const struct req *req) |
{ |
{ |
|
|
if (NULL != req->q.manpath) { |
if (NULL != req->q.query) { |
printf("&manpath="); |
printf("query="); |
html_print(req->q.manpath); |
html_print(req->q.query); |
} |
} |
|
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
if (NULL != req->q.sec) { |
if (NULL != req->q.sec) { |
printf("&sec="); |
printf("&sec="); |
html_print(req->q.sec); |
html_print(req->q.sec); |
Line 180 html_printquery(const struct req *req) |
|
Line 187 html_printquery(const struct req *req) |
|
printf("&arch="); |
printf("&arch="); |
html_print(req->q.arch); |
html_print(req->q.arch); |
} |
} |
if (NULL != req->q.expr) { |
if (NULL != req->q.manpath && |
printf("&query="); |
strcmp(req->q.manpath, req->p[0])) { |
html_print(req->q.expr); |
printf("&manpath="); |
|
html_print(req->q.manpath); |
} |
} |
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
|
} |
} |
|
|
static void |
static void |
Line 242 http_parse(struct req *req, const char *qs) |
|
Line 248 http_parse(struct req *req, const char *qs) |
|
req->q.manpath = NULL; |
req->q.manpath = NULL; |
req->q.arch = NULL; |
req->q.arch = NULL; |
req->q.sec = NULL; |
req->q.sec = NULL; |
req->q.expr = NULL; |
req->q.query = NULL; |
req->q.equal = 1; |
req->q.equal = 1; |
|
|
key = val = NULL; |
key = val = NULL; |
Line 270 http_parse(struct req *req, const char *qs) |
|
Line 276 http_parse(struct req *req, const char *qs) |
|
/* Handle key-value pairs. */ |
/* Handle key-value pairs. */ |
|
|
if ( ! strcmp(key, "query")) |
if ( ! strcmp(key, "query")) |
set_query_attr(&req->q.expr, &val); |
set_query_attr(&req->q.query, &val); |
|
|
else if ( ! strcmp(key, "apropos")) |
else if ( ! strcmp(key, "apropos")) |
req->q.equal = !strcmp(val, "0"); |
req->q.equal = !strcmp(val, "0"); |
Line 437 resp_searchform(const struct req *req) |
|
Line 443 resp_searchform(const struct req *req) |
|
|
|
printf( "<TABLE><TR><TD>\n" |
printf( "<TABLE><TR><TD>\n" |
"<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\""); |
"<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\""); |
if (NULL != req->q.expr) |
if (NULL != req->q.query) |
html_print(req->q.expr); |
html_print(req->q.query); |
puts("\" SIZE=\"40\">"); |
puts("\" SIZE=\"40\">"); |
|
|
/* Write submission and reset buttons. */ |
/* Write submission and reset buttons. */ |
Line 451 resp_searchform(const struct req *req) |
|
Line 457 resp_searchform(const struct req *req) |
|
printf( "</TD><TD>\n" |
printf( "</TD><TD>\n" |
"<INPUT TYPE=\"radio\" "); |
"<INPUT TYPE=\"radio\" "); |
if (req->q.equal) |
if (req->q.equal) |
printf("CHECKED "); |
printf("CHECKED=\"checked\" "); |
printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n" |
printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n" |
"<LABEL FOR=\"show\">Show named manual page</LABEL>\n"); |
"<LABEL FOR=\"show\">Show named manual page</LABEL>\n"); |
|
|
/* Write section selector. */ |
/* Write section selector. */ |
|
|
printf( "</TD></TR><TR><TD>\n" |
puts( "</TD></TR><TR><TD>\n" |
"<SELECT NAME=\"sec\">"); |
"<SELECT NAME=\"sec\">"); |
for (i = 0; i < sec_MAX; i++) { |
for (i = 0; i < sec_MAX; i++) { |
printf("<OPTION VALUE=\"%s\"", sec_numbers[i]); |
printf("<OPTION VALUE=\"%s\"", sec_numbers[i]); |
if (NULL != req->q.sec && |
if (NULL != req->q.sec && |
0 == strcmp(sec_numbers[i], req->q.sec)) |
0 == strcmp(sec_numbers[i], req->q.sec)) |
printf(" SELECTED"); |
printf(" SELECTED=\"selected\""); |
printf(">%s</OPTION>\n", sec_names[i]); |
printf(">%s</OPTION>\n", sec_names[i]); |
} |
} |
puts("</SELECT>"); |
puts("</SELECT>"); |
Line 473 resp_searchform(const struct req *req) |
|
Line 479 resp_searchform(const struct req *req) |
|
printf( "<SELECT NAME=\"arch\">\n" |
printf( "<SELECT NAME=\"arch\">\n" |
"<OPTION VALUE=\"default\""); |
"<OPTION VALUE=\"default\""); |
if (NULL == req->q.arch) |
if (NULL == req->q.arch) |
printf(" SELECTED"); |
printf(" SELECTED=\"selected\""); |
puts(">All Architectures</OPTION>"); |
puts(">All Architectures</OPTION>"); |
for (i = 0; i < arch_MAX; i++) { |
for (i = 0; i < arch_MAX; i++) { |
printf("<OPTION VALUE=\"%s\"", arch_names[i]); |
printf("<OPTION VALUE=\"%s\"", arch_names[i]); |
if (NULL != req->q.arch && |
if (NULL != req->q.arch && |
0 == strcmp(arch_names[i], req->q.arch)) |
0 == strcmp(arch_names[i], req->q.arch)) |
printf(" SELECTED"); |
printf(" SELECTED=\"selected\""); |
printf(">%s</OPTION>\n", arch_names[i]); |
printf(">%s</OPTION>\n", arch_names[i]); |
} |
} |
puts("</SELECT>"); |
puts("</SELECT>"); |
Line 492 resp_searchform(const struct req *req) |
|
Line 498 resp_searchform(const struct req *req) |
|
printf("<OPTION "); |
printf("<OPTION "); |
if (NULL == req->q.manpath ? 0 == i : |
if (NULL == req->q.manpath ? 0 == i : |
0 == strcmp(req->q.manpath, req->p[i])) |
0 == strcmp(req->q.manpath, req->p[i])) |
printf("SELECTED "); |
printf("SELECTED=\"selected\" "); |
printf("VALUE=\""); |
printf("VALUE=\""); |
html_print(req->p[i]); |
html_print(req->p[i]); |
printf("\">"); |
printf("\">"); |
Line 507 resp_searchform(const struct req *req) |
|
Line 513 resp_searchform(const struct req *req) |
|
printf( "</TD><TD>\n" |
printf( "</TD><TD>\n" |
"<INPUT TYPE=\"radio\" "); |
"<INPUT TYPE=\"radio\" "); |
if (0 == req->q.equal) |
if (0 == req->q.equal) |
printf("CHECKED "); |
printf("CHECKED=\"checked\" "); |
printf( "NAME=\"apropos\" ID=\"search\" VALUE=\"1\">\n" |
printf( "NAME=\"apropos\" ID=\"search\" VALUE=\"1\">\n" |
"<LABEL FOR=\"search\">Search with apropos query</LABEL>\n"); |
"<LABEL FOR=\"search\">Search with apropos query</LABEL>\n"); |
|
|
Line 565 pg_index(const struct req *req) |
|
Line 571 pg_index(const struct req *req) |
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
printf("<P>\n" |
printf("<P>\n" |
"This web interface is documented in the " |
"This web interface is documented in the\n" |
"<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A> " |
"<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A>\n" |
"manual, and the " |
"manual, and the\n" |
"<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A> " |
"<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A>\n" |
"manual explains the query syntax.\n" |
"manual explains the query syntax.\n" |
"</P>\n", |
"</P>\n", |
scriptname, scriptname); |
scriptname, scriptname); |
Line 870 format(const struct req *req, const char *file) |
|
Line 876 format(const struct req *req, const char *file) |
|
} |
} |
|
|
snprintf(opts, sizeof(opts), "fragment,man=%s?" |
snprintf(opts, sizeof(opts), "fragment,man=%s?" |
"manpath=%s&query=%%N&sec=%%S&arch=%s", |
"manpath=%s&query=%%N&sec=%%S%s%s", |
scriptname, req->q.manpath, |
scriptname, req->q.manpath, |
|
req->q.arch ? "&arch=" : "", |
req->q.arch ? req->q.arch : ""); |
req->q.arch ? req->q.arch : ""); |
|
|
mparse_result(mp, &mdoc, &man, NULL); |
mparse_result(mp, &mdoc, &man, NULL); |
Line 998 pg_search(const struct req *req) |
|
Line 1005 pg_search(const struct req *req) |
|
* Yes, this is half-ass. But it works for now. |
* Yes, this is half-ass. But it works for now. |
*/ |
*/ |
|
|
ep = req->q.expr; |
ep = req->q.query; |
while (ep && isspace((unsigned char)*ep)) |
while (ep && isspace((unsigned char)*ep)) |
ep++; |
ep++; |
|
|
|
|
|
|
if ('\0' != *path) |
if ('\0' != *path) |
pg_show(&req, path); |
pg_show(&req, path); |
else if (NULL != req.q.expr) |
else if (NULL != req.q.query) |
pg_search(&req); |
pg_search(&req); |
else |
else |
pg_index(&req); |
pg_index(&req); |
|
|
free(req.q.manpath); |
free(req.q.manpath); |
free(req.q.arch); |
free(req.q.arch); |
free(req.q.sec); |
free(req.q.sec); |
free(req.q.expr); |
free(req.q.query); |
for (i = 0; i < (int)req.psz; i++) |
for (i = 0; i < (int)req.psz; i++) |
free(req.p[i]); |
free(req.p[i]); |
free(req.p); |
free(req.p); |