Explicit block closure macros clobber next-line block head scope,

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 4cb4fa9224fcecdec637c5400b46e0706b2f9e2c..65064ab2ad6ca4bb6c3018742bf0f9719457e4bc 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.99 2014/10/07 18:20:06 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.102 2014/11/26 17:55:27 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -163,8 +163,7 @@ http_printquery(const struct req *req, const char *sep)
                printf("%sarch=", sep);
                http_print(req->q.arch);
        }
-       if (NULL != req->q.manpath &&
-           strcmp(req->q.manpath, req->p[0])) {
+       if (strcmp(req->q.manpath, req->p[0])) {
                printf("%smanpath=", sep);
                http_print(req->q.manpath);
        }
@@ -298,11 +297,6 @@ next:
                if (*qs != '\0')
                        qs++;
        }
-
-       /* Fall back to the default manpath. */
-
-       if (req->q.manpath == NULL)
-               req->q.manpath = mandoc_strdup(req->p[0]);
 }
 
 static void
@@ -469,8 +463,7 @@ resp_searchform(const struct req *req)
                puts("<SELECT NAME=\"manpath\">");
                for (i = 0; i < (int)req->psz; i++) {
                        printf("<OPTION ");
-                       if (NULL == req->q.manpath ? 0 == i :
-                           0 == strcmp(req->q.manpath, req->p[i]))
+                       if (strcmp(req->q.manpath, req->p[i]) == 0)
                                printf("SELECTED=\"selected\" ");
                        printf("VALUE=\"");
                        html_print(req->p[i]);
@@ -824,6 +817,7 @@ static void
 format(const struct req *req, const char *file)
 {
        struct mparse   *mp;
+       struct mchars   *mchars;
        struct mdoc     *mdoc;
        struct man      *man;
        void            *vp;
@@ -837,8 +831,9 @@ format(const struct req *req, const char *file)
                return;
        }
 
+       mchars = mchars_alloc();
        mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
-           req->q.manpath);
+           mchars, req->q.manpath);
        rc = mparse_readfd(mp, fd, file);
        close(fd);
 
@@ -864,10 +859,11 @@ format(const struct req *req, const char *file)
                    req->q.manpath, file);
                pg_error_internal();
                mparse_free(mp);
+               mchars_free(mchars);
                return;
        }
 
-       vp = html_alloc(opts);
+       vp = html_alloc(mchars, opts);
 
        if (NULL != mdoc)
                html_mdoc(vp, mdoc);
@@ -876,6 +872,7 @@ format(const struct req *req, const char *file)
 
        html_free(vp);
        mparse_free(mp);
+       mchars_free(mchars);
        free(opts);
 }
 
@@ -973,6 +970,7 @@ pg_search(const struct req *req)
        search.sec = req->q.sec;
        search.outkey = "Nd";
        search.argmode = req->q.equal ? ARG_NAME : ARG_EXPR;
+       search.firstmatch = 1;
 
        paths.sz = 1;
        paths.paths = mandoc_malloc(sizeof(char *));
@@ -1076,8 +1074,9 @@ main(void)
        if (NULL != (querystring = getenv("QUERY_STRING")))
                http_parse(&req, querystring);
 
-       if ( ! (NULL == req.q.manpath ||
-           validate_manpath(&req, req.q.manpath))) {
+       if (req.q.manpath == NULL)
+               req.q.manpath = mandoc_strdup(req.p[0]);
+       else if ( ! validate_manpath(&req, req.q.manpath)) {
                pg_error_badrequest(
                    "You specified an invalid manpath.");
                return(EXIT_FAILURE);