version 1.134, 2016/07/10 10:05:33 |
version 1.136, 2016/07/31 23:37:23 |
Line 800 resp_format(const struct req *req, const char *file) |
|
Line 800 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); |
|
|
|
|
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 1087 parse_path_info(struct req *req, const char *path) |
|
Line 1090 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]; |
} |
} |
|
|
/* |
/* |