From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (fantadrom.bsd.lv [local]) by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 377bac54 for ; Thu, 14 Apr 2016 15:41:03 -0500 (EST) Date: Thu, 14 Apr 2016 15:41:03 -0500 (EST) Message-Id: <4864959827787032495.enqueue@fantadrom.bsd.lv> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: schwarze@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: do not rewrite short queries X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- do not rewrite short queries Modified Files: -------------- mdocml: cgi.c Revision Data ------------- Index: cgi.c =================================================================== RCS file: /home/cvs/mdocml/mdocml/cgi.c,v retrieving revision 1.120 retrieving revision 1.121 diff -Lcgi.c -Lcgi.c -u -p -r1.120 -r1.121 --- cgi.c +++ cgi.c @@ -55,6 +55,7 @@ struct req { struct query q; char **p; /* array of available manpaths */ size_t psz; /* number of available manpaths */ + int isquery; /* QUERY_STRING used, not PATH_INFO */ }; static void catman(const struct req *, const char *); @@ -188,6 +189,7 @@ http_parse(struct req *req, const char * char *key, *val; size_t keysz, valsz; + req->isquery = 1; req->q.manpath = NULL; req->q.arch = NULL; req->q.sec = NULL; @@ -568,7 +570,7 @@ pg_searchres(const struct req *req, stru return; } - if (1 == sz) { + if (req->isquery && sz == 1) { /* * If we have just one result, then jump there now * without any delay. @@ -1085,6 +1087,7 @@ path_parse(struct req *req, const char * { int dir_done; + req->isquery = 0; req->q.equal = 1; req->q.manpath = mandoc_strdup(path); -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv