summaryrefslogtreecommitdiffstats
path: root/cgi.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-07-25 16:43:37 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-07-25 16:43:37 +0000
commit0c3ab5615d85661380a2cc0e4f94c73fc6440645 (patch)
treeea13cd4829d51f35f95d9095ffc8f4868cf87d98 /cgi.c
parentd0007bbebcea5e5b4734aaa73200855d6ddb1fcc (diff)
downloadmandoc-0c3ab5615d85661380a2cc0e4f94c73fc6440645.tar.gz
clean up pg_show() to not modify a string returned from getenv(3)
Diffstat (limited to 'cgi.c')
-rw-r--r--cgi.c33
1 files changed, 19 insertions, 14 deletions
diff --git a/cgi.c b/cgi.c
index f222c92e..8b099607 100644
--- a/cgi.c
+++ b/cgi.c
@@ -908,20 +908,23 @@ resp_show(const struct req *req, const char *file)
}
static void
-pg_show(struct req *req, const char *path)
+pg_show(struct req *req, const char *fullpath)
{
- char *sub;
+ char *manpath;
+ const char *file;
- if (NULL == path || NULL == (sub = strchr(path, '/'))) {
+ if ((file = strchr(fullpath, '/')) == NULL) {
pg_error_badrequest(
"You did not specify a page to show.");
return;
}
- *sub++ = '\0';
+ manpath = mandoc_strndup(fullpath, file - fullpath);
+ file++;
- if ( ! validate_manpath(req, path)) {
+ if ( ! validate_manpath(req, manpath)) {
pg_error_badrequest(
"You specified an invalid manpath.");
+ free(manpath);
return;
}
@@ -931,27 +934,29 @@ pg_show(struct req *req, const char *path)
* relative to the manpath root.
*/
- if (-1 == chdir(path)) {
+ if (chdir(manpath) == -1) {
fprintf(stderr, "chdir %s: %s\n",
- path, strerror(errno));
+ manpath, strerror(errno));
pg_error_internal();
+ free(manpath);
return;
}
- if ( ! validate_filename(sub)) {
+ if (strcmp(manpath, "mandoc")) {
+ free(req->q.manpath);
+ req->q.manpath = manpath;
+ } else
+ free(manpath);
+
+ if ( ! validate_filename(file)) {
pg_error_badrequest(
"You specified an invalid manual file.");
return;
}
- if (strcmp(path, "mandoc")) {
- free(req->q.manpath);
- req->q.manpath = mandoc_strdup(path);
- }
-
resp_begin_html(200, NULL);
resp_searchform(req);
- resp_show(req, sub);
+ resp_show(req, file);
resp_end_html();
}