summaryrefslogtreecommitdiffstats
path: root/cgi.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-07-25 16:56:06 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-07-25 16:56:06 +0000
commit944871219d11487657d87b6cf9a60035000f7d02 (patch)
treefb60620b840dfcc815f59f061792aef6d6d508f6 /cgi.c
parent0c3ab5615d85661380a2cc0e4f94c73fc6440645 (diff)
downloadmandoc-944871219d11487657d87b6cf9a60035000f7d02.tar.gz
The names of all other struct query memebers match the corresponding
QUERY_STRING keys, so rename "expr" to "query". Also add some missing function prototypes. No functional change.
Diffstat (limited to 'cgi.c')
-rw-r--r--cgi.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/cgi.c b/cgi.c
index 8b099607..86acf215 100644
--- a/cgi.c
+++ b/cgi.c
@@ -42,7 +42,7 @@ struct query {
char *manpath; /* desired manual directory */
char *arch; /* architecture */
char *sec; /* manual section */
- char *expr; /* unparsed expression string */
+ char *query; /* unparsed query expression */
int equal; /* match whole names, not substrings */
};
@@ -76,6 +76,10 @@ static void resp_begin_http(int, const char *);
static void resp_end_html(void);
static void resp_searchform(const struct req *);
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 */
@@ -156,9 +160,9 @@ http_printquery(const struct req *req)
printf("&arch=");
http_print(req->q.arch);
}
- if (NULL != req->q.expr) {
+ if (NULL != req->q.query) {
printf("&query=");
- http_print(req->q.expr);
+ http_print(req->q.query);
}
if (0 == req->q.equal)
printf("&apropos=1");
@@ -180,9 +184,9 @@ html_printquery(const struct req *req)
printf("&amp;arch=");
html_print(req->q.arch);
}
- if (NULL != req->q.expr) {
+ if (NULL != req->q.query) {
printf("&amp;query=");
- html_print(req->q.expr);
+ html_print(req->q.query);
}
if (0 == req->q.equal)
printf("&amp;apropos=1");
@@ -242,7 +246,7 @@ http_parse(struct req *req, const char *qs)
req->q.manpath = NULL;
req->q.arch = NULL;
req->q.sec = NULL;
- req->q.expr = NULL;
+ req->q.query = NULL;
req->q.equal = 1;
key = val = NULL;
@@ -270,7 +274,7 @@ http_parse(struct req *req, const char *qs)
/* Handle key-value pairs. */
if ( ! strcmp(key, "query"))
- set_query_attr(&req->q.expr, &val);
+ set_query_attr(&req->q.query, &val);
else if ( ! strcmp(key, "apropos"))
req->q.equal = !strcmp(val, "0");
@@ -437,8 +441,8 @@ resp_searchform(const struct req *req)
printf( "<TABLE><TR><TD>\n"
"<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\"");
- if (NULL != req->q.expr)
- html_print(req->q.expr);
+ if (NULL != req->q.query)
+ html_print(req->q.query);
puts("\" SIZE=\"40\">");
/* Write submission and reset buttons. */
@@ -998,7 +1002,7 @@ pg_search(const struct req *req)
* Yes, this is half-ass. But it works for now.
*/
- ep = req->q.expr;
+ ep = req->q.query;
while (ep && isspace((unsigned char)*ep))
ep++;
@@ -1101,7 +1105,7 @@ main(void)
if ('\0' != *path)
pg_show(&req, path);
- else if (NULL != req.q.expr)
+ else if (NULL != req.q.query)
pg_search(&req);
else
pg_index(&req);
@@ -1109,7 +1113,7 @@ main(void)
free(req.q.manpath);
free(req.q.arch);
free(req.q.sec);
- free(req.q.expr);
+ free(req.q.query);
for (i = 0; i < (int)req.psz; i++)
free(req.p[i]);
free(req.p);