version 1.131, 2016/04/29 10:45:36 |
version 1.134, 2016/07/10 10:05:33 |
Line 385 resp_searchform(const struct req *req, enum focus focu |
|
Line 385 resp_searchform(const struct req *req, enum focus focu |
|
|
|
/* Write query input box. */ |
/* Write query input box. */ |
|
|
printf( "<table><tr><td>\n" |
printf("<input type=\"text\" name=\"query\" value=\""); |
"<input type=\"text\" name=\"query\" value=\""); |
|
if (req->q.query != NULL) |
if (req->q.query != NULL) |
html_print(req->q.query); |
html_print(req->q.query); |
printf( "\" size=\"40\""); |
printf( "\" size=\"40\""); |
Line 394 resp_searchform(const struct req *req, enum focus focu |
|
Line 393 resp_searchform(const struct req *req, enum focus focu |
|
printf(" autofocus"); |
printf(" autofocus"); |
puts(">"); |
puts(">"); |
|
|
/* Write submission and reset buttons. */ |
/* Write submission buttons. */ |
|
|
printf( "<input type=\"submit\" value=\"Submit\">\n" |
printf( "<button type=\"submit\" name=\"apropos\" value=\"0\">" |
"<input type=\"reset\" value=\"Reset\">\n"); |
"man</button>\n" |
|
"<button type=\"submit\" name=\"apropos\" value=\"1\">" |
|
"apropos</button>\n<br/>\n"); |
|
|
/* Write show radio button */ |
|
|
|
printf( "</td><td>\n" |
|
"<input type=\"radio\" "); |
|
if (req->q.equal) |
|
printf("checked=\"checked\" "); |
|
printf( "name=\"apropos\" id=\"show\" value=\"0\">\n" |
|
"<label for=\"show\">Show named manual page</label>\n"); |
|
|
|
/* Write section selector. */ |
/* Write section selector. */ |
|
|
puts( "</td></tr><tr><td>\n" |
puts("<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 && |
Line 454 resp_searchform(const struct req *req, enum focus focu |
|
Line 445 resp_searchform(const struct req *req, enum focus focu |
|
puts("</select>"); |
puts("</select>"); |
} |
} |
|
|
/* Write search radio button */ |
puts("</fieldset>\n" |
|
|
printf( "</td><td>\n" |
|
"<input type=\"radio\" "); |
|
if (0 == req->q.equal) |
|
printf("checked=\"checked\" "); |
|
printf( "name=\"apropos\" id=\"search\" value=\"1\">\n" |
|
"<label for=\"search\">Search with apropos query</label>\n"); |
|
|
|
puts("</td></tr></table>\n" |
|
"</fieldset>\n" |
|
"</form>\n" |
"</form>\n" |
"</div>"); |
"</div>"); |
puts("<!-- End search form. //-->"); |
puts("<!-- End search form. //-->"); |
Line 489 validate_manpath(const struct req *req, const char* ma |
|
Line 470 validate_manpath(const struct req *req, const char* ma |
|
{ |
{ |
size_t i; |
size_t i; |
|
|
if ( ! strcmp(manpath, "mandoc")) |
|
return 1; |
|
|
|
for (i = 0; i < req->psz; i++) |
for (i = 0; i < req->psz; i++) |
if ( ! strcmp(manpath, req->p[i])) |
if ( ! strcmp(manpath, req->p[i])) |
return 1; |
return 1; |
Line 518 pg_index(const struct req *req) |
|
Line 496 pg_index(const struct req *req) |
|
resp_searchform(req, FOCUS_QUERY); |
resp_searchform(req, FOCUS_QUERY); |
printf("<p>\n" |
printf("<p>\n" |
"This web interface is documented in the\n" |
"This web interface is documented in the\n" |
"<a href=\"/%s%smandoc/man8/man.cgi.8\">man.cgi</a>\n" |
"<a href=\"/%s%sman.cgi.8\">man.cgi(8)</a>\n" |
"manual, and the\n" |
"manual, and the\n" |
"<a href=\"/%s%smandoc/man1/apropos.1\">apropos</a>\n" |
"<a href=\"/%s%sapropos.1\">apropos(1)</a>\n" |
"manual explains the query syntax.\n" |
"manual explains the query syntax.\n" |
"</p>\n", |
"</p>\n", |
scriptname, *scriptname == '\0' ? "" : "/", |
scriptname, *scriptname == '\0' ? "" : "/", |
Line 903 pg_show(struct req *req, const char *fullpath) |
|
Line 881 pg_show(struct req *req, const char *fullpath) |
|
free(manpath); |
free(manpath); |
return; |
return; |
} |
} |
|
free(manpath); |
|
|
if (strcmp(manpath, "mandoc")) { |
|
free(req->q.manpath); |
|
req->q.manpath = manpath; |
|
} else |
|
free(manpath); |
|
|
|
if ( ! validate_filename(file)) { |
if ( ! validate_filename(file)) { |
pg_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid manual file."); |
"You specified an invalid manual file."); |
|
|
|
|
if (*path != '\0') { |
if (*path != '\0') { |
parse_path_info(&req, path); |
parse_path_info(&req, path); |
if (access(path, F_OK) == -1) |
if (req.q.manpath == NULL || access(path, F_OK) == -1) |
path = ""; |
path = ""; |
} else if ((querystring = getenv("QUERY_STRING")) != NULL) |
} else if ((querystring = getenv("QUERY_STRING")) != NULL) |
parse_query_string(&req, querystring); |
parse_query_string(&req, querystring); |