From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: The names of all other struct query memebers match the
Date: Fri, 25 Jul 2014 12:56:06 -0400 (EDT) [thread overview]
Message-ID: <201407251656.s6PGu6VX001558@krisdoz.my.domain> (raw)
Log Message:
-----------
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.
Modified Files:
--------------
mdocml:
cgi.c
Revision Data
-------------
Index: cgi.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/cgi.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -Lcgi.c -Lcgi.c -u -p -r1.84 -r1.85
--- cgi.c
+++ 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
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("&arch=");
html_print(req->q.arch);
}
- if (NULL != req->q.expr) {
+ if (NULL != req->q.query) {
printf("&query=");
- html_print(req->q.expr);
+ html_print(req->q.query);
}
if (0 == req->q.equal)
printf("&apropos=1");
@@ -242,7 +246,7 @@ http_parse(struct req *req, const char *
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 *
/* 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);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2014-07-25 16:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201407251656.s6PGu6VX001558@krisdoz.my.domain \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).