Support .RE with an argument; needed for audio/pms(1).

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 81166e390f84de538261378c930c8d147d34693b..546103e4fcd60f7f859467f058603bc66a6d189c 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*     $Id: cgi.c,v 1.101 2014/11/11 19:04:55 schwarze Exp $ */
+/*     $Id: cgi.c,v 1.103 2015/01/15 04:26:39 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]);
@@ -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",
@@ -1081,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);