version 1.131, 2016/04/29 10:45:36 |
version 1.139, 2016/09/01 15:07:24 |
Line 113 static const char *const sec_names[] = { |
|
Line 113 static const char *const sec_names[] = { |
|
static const int sec_MAX = sizeof(sec_names) / sizeof(char *); |
static const int sec_MAX = sizeof(sec_names) / sizeof(char *); |
|
|
static const char *const arch_names[] = { |
static const char *const arch_names[] = { |
"amd64", "alpha", "armish", "armv7", |
"amd64", "alpha", "armv7", |
"hppa", "hppa64", "i386", "landisk", |
"hppa", "i386", "landisk", |
"loongson", "luna88k", "macppc", "mips64", |
"loongson", "luna88k", "macppc", "mips64", |
"octeon", "sgi", "socppc", "sparc", |
"octeon", "sgi", "socppc", |
"sparc64", "zaurus", |
"sparc64", "zaurus", |
"amiga", "arc", "arm32", "atari", |
"amiga", "arc", "armish", "arm32", |
"aviion", "beagle", "cats", "hp300", |
"atari", "aviion", "beagle", "cats", |
|
"hppa64", "hp300", |
"ia64", "mac68k", "mvme68k", "mvme88k", |
"ia64", "mac68k", "mvme68k", "mvme88k", |
"mvmeppc", "palm", "pc532", "pegasos", |
"mvmeppc", "palm", "pc532", "pegasos", |
"pmax", "powerpc", "solbourne", "sun3", |
"pmax", "powerpc", "solbourne", "sparc", |
"vax", "wgrisc", "x68k" |
"sun3", "vax", "wgrisc", "x68k" |
}; |
}; |
static const int arch_MAX = sizeof(arch_names) / sizeof(char *); |
static const int arch_MAX = sizeof(arch_names) / sizeof(char *); |
|
|
Line 337 resp_copy(const char *filename) |
|
Line 338 resp_copy(const char *filename) |
|
fflush(stdout); |
fflush(stdout); |
while ((sz = read(fd, buf, sizeof(buf))) > 0) |
while ((sz = read(fd, buf, sizeof(buf))) > 0) |
write(STDOUT_FILENO, buf, sz); |
write(STDOUT_FILENO, buf, sz); |
|
close(fd); |
} |
} |
} |
} |
|
|
Line 385 resp_searchform(const struct req *req, enum focus focu |
|
Line 387 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 395 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 447 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 472 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 498 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 822 resp_format(const struct req *req, const char *file) |
|
Line 802 resp_format(const struct req *req, const char *file) |
|
} |
} |
|
|
mchars_alloc(); |
mchars_alloc(); |
mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, req->q.manpath); |
mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1, |
|
MANDOCLEVEL_BADARG, NULL, req->q.manpath); |
mparse_readfd(mp, fd, file); |
mparse_readfd(mp, fd, file); |
close(fd); |
close(fd); |
|
|
Line 903 pg_show(struct req *req, const char *fullpath) |
|
Line 884 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); |
|
|
static void |
static void |
parse_path_info(struct req *req, const char *path) |
parse_path_info(struct req *req, const char *path) |
{ |
{ |
char *dir; |
char *dir[4]; |
|
int i; |
|
|
req->isquery = 0; |
req->isquery = 0; |
req->q.equal = 1; |
req->q.equal = 1; |
req->q.manpath = mandoc_strdup(path); |
req->q.manpath = mandoc_strdup(path); |
|
req->q.arch = NULL; |
|
|
/* Mandatory manual page name. */ |
/* Mandatory manual page name. */ |
if ((req->q.query = strrchr(req->q.manpath, '/')) == NULL) { |
if ((req->q.query = strrchr(req->q.manpath, '/')) == NULL) { |
Line 1114 parse_path_info(struct req *req, const char *path) |
|
Line 1092 parse_path_info(struct req *req, const char *path) |
|
} |
} |
|
|
/* Handle the case of name[.section] only. */ |
/* Handle the case of name[.section] only. */ |
if (req->q.manpath == NULL) { |
if (req->q.manpath == NULL) |
req->q.arch = NULL; |
|
return; |
return; |
} |
|
req->q.query = mandoc_strdup(req->q.query); |
req->q.query = mandoc_strdup(req->q.query); |
|
|
/* Optional architecture. */ |
/* Split directory components. */ |
dir = strrchr(req->q.manpath, '/'); |
dir[i = 0] = req->q.manpath; |
if (dir != NULL && strncmp(dir + 1, "man", 3) != 0) { |
while ((dir[i + 1] = strchr(dir[i], '/')) != NULL) { |
*dir++ = '\0'; |
if (++i == 3) { |
req->q.arch = mandoc_strdup(dir); |
pg_error_badrequest( |
dir = strrchr(req->q.manpath, '/'); |
"You specified too many directory components."); |
} else |
exit(EXIT_FAILURE); |
req->q.arch = NULL; |
} |
|
*dir[i]++ = '\0'; |
|
} |
|
|
/* Optional directory name. */ |
/* Optional manpath. */ |
if (dir != NULL && strncmp(dir + 1, "man", 3) == 0) { |
if ((i = validate_manpath(req, req->q.manpath)) == 0) |
*dir++ = '\0'; |
req->q.manpath = NULL; |
|
else if (dir[1] == NULL) |
|
return; |
|
|
|
/* Optional section. */ |
|
if (strncmp(dir[i], "man", 3) == 0) { |
free(req->q.sec); |
free(req->q.sec); |
req->q.sec = mandoc_strdup(dir + 3); |
req->q.sec = mandoc_strdup(dir[i++] + 3); |
} |
} |
|
if (dir[i] == NULL) { |
|
if (req->q.manpath == NULL) |
|
free(dir[0]); |
|
return; |
|
} |
|
if (dir[i + 1] != NULL) { |
|
pg_error_badrequest( |
|
"You specified an invalid directory component."); |
|
exit(EXIT_FAILURE); |
|
} |
|
|
|
/* Optional architecture. */ |
|
if (i) { |
|
req->q.arch = mandoc_strdup(dir[i]); |
|
if (req->q.manpath == NULL) |
|
free(dir[0]); |
|
} else |
|
req->q.arch = dir[0]; |
} |
} |
|
|
/* |
/* |