Do not confuse .Bl -column lists that just broken another block

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index f09aaf673c8a81ddbf3e80ff4c43aa668e55444a..05d1b8a0df010f4083a2762eaa22a046ddcaec9f 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.100 2014/10/28 17:36:19 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.104 2015/02/10 08:05:30 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -58,10 +58,10 @@ static      void             catman(const struct req *, const char *);
 static void             format(const struct req *, const char *);
 static void             html_print(const char *);
 static void             html_putchar(char);
-static int              http_decode(char *);
+static int              http_decode(char *);
 static void             http_parse(struct req *, const char *);
 static void             http_print(const char *);
-static void             http_putchar(char);
+static void             http_putchar(char);
 static void             http_printquery(const struct req *, const char *);
 static void             pathgen(struct req *);
 static void             pg_error_badrequest(const char *);
@@ -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);
        }
@@ -187,7 +186,7 @@ http_print(const char *p)
 static void
 html_print(const char *p)
 {
-       
+
        if (NULL == p)
                return;
        while ('\0' != *p)
@@ -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]);
@@ -628,7 +621,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
        for (i = 0; i < sz; i++) {
                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"
-                      "<A HREF=\"%s/%s/%s?", 
+                      "<A HREF=\"%s/%s/%s?",
                    scriptname, req->q.manpath, r[i].file);
                http_printquery(req, "&amp;");
                printf("\">");
@@ -708,7 +701,7 @@ catman(const struct req *req, const char *file)
        while (NULL != (p = fgetln(f, &len))) {
                bold = italic = 0;
                for (i = 0; i < (int)len - 1; i++) {
-                       /* 
+                       /*
                         * This means that the catpage is out of state.
                         * Ignore it and keep going (although the
                         * catpage is bogus).
@@ -749,7 +742,7 @@ catman(const struct req *req, const char *file)
                                continue;
                        }
 
-                       /* 
+                       /*
                         * Handle funny behaviour troff-isms.
                         * These grok'd from the original man2html.c.
                         */
@@ -787,7 +780,7 @@ catman(const struct req *req, const char *file)
                        }
 
                        /* Bold mode. */
-                       
+
                        if (italic)
                                printf("</I>");
                        if ( ! bold)
@@ -798,9 +791,9 @@ catman(const struct req *req, const char *file)
                        html_putchar(p[i]);
                }
 
-               /* 
+               /*
                 * Clean up the last character.
-                * We can get to a newline; don't print that. 
+                * We can get to a newline; don't print that.
                 */
 
                if (italic)
@@ -829,7 +822,6 @@ format(const struct req *req, const char *file)
        struct man      *man;
        void            *vp;
        char            *opts;
-       enum mandoclevel rc;
        int              fd;
        int              usepath;
 
@@ -839,18 +831,11 @@ format(const struct req *req, const char *file)
        }
 
        mchars = mchars_alloc();
-       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL,
            mchars, req->q.manpath);
-       rc = mparse_readfd(mp, fd, file);
+       mparse_readfd(mp, fd, file);
        close(fd);
 
-       if (rc >= MANDOCLEVEL_FATAL) {
-               fprintf(stderr, "fatal mandoc error: %s/%s\n",
-                   req->q.manpath, file);
-               pg_error_internal();
-               return;
-       }
-
        usepath = strcmp(req->q.manpath, req->p[0]);
        mandoc_asprintf(&opts,
            "fragment,man=%s?query=%%N&sec=%%S%s%s%s%s",
@@ -906,7 +891,7 @@ pg_show(struct req *req, const char *fullpath)
                pg_error_badrequest(
                    "You did not specify a page to show.");
                return;
-       } 
+       }
        manpath = mandoc_strndup(fullpath, file - fullpath);
        file++;
 
@@ -977,6 +962,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 *));
@@ -1070,7 +1056,7 @@ main(void)
                    MAN_DIR, strerror(errno));
                pg_error_internal();
                return(EXIT_FAILURE);
-       } 
+       }
 
        memset(&req, 0, sizeof(struct req));
        pathgen(&req);
@@ -1080,8 +1066,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);