merge from VERSION_1_12:

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 205235a24c5491d771aaf9721094ee45cdd218d1..6d40fcde42fd9b124be4dafd63fb9fefdc5023e2 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,6 +1,6 @@
-/*     $Id: cgi.c,v 1.41 2012/03/24 00:31:55 kristaps Exp $ */
+/*     $Id: cgi.c,v 1.45 2013/06/05 02:00:26 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <sys/param.h>
 #include <sys/wait.h>
 
 #include <assert.h>
@@ -726,14 +725,14 @@ format(const struct req *req, const char *file)
        struct man      *man;
        void            *vp;
        enum mandoclevel rc;
-       char             opts[MAXPATHLEN + 128];
+       char             opts[PATH_MAX + 128];
 
        if (-1 == (fd = open(file, O_RDONLY, 0))) {
                resp_baddb();
                return;
        }
 
-       mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
+       mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL, NULL);
        rc = mparse_readfd(mp, fd, file);
        close(fd);
 
@@ -743,7 +742,7 @@ format(const struct req *req, const char *file)
        }
 
        snprintf(opts, sizeof(opts), "fragment,"
-                       "man=%s/search.html?sec=%%S&expr=%%N,"
+                       "man=%s/search.html?sec=%%S&expr=Nm~^%%N$,"
                        /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/,
                        progname);
 
@@ -777,7 +776,7 @@ pg_show(const struct req *req, char *path)
        struct manpaths  ps;
        size_t           sz;
        char            *sub;
-       char             file[MAXPATHLEN];
+       char             file[PATH_MAX];
        const char      *cp;
        int              rc, catm;
        unsigned int     vol, rec, mr;
@@ -831,10 +830,10 @@ pg_show(const struct req *req, char *path)
                goto out;
        }
 
-       sz = strlcpy(file, ps.paths[vol], MAXPATHLEN);
-       assert(sz < MAXPATHLEN);
-       strlcat(file, "/", MAXPATHLEN);
-       strlcat(file, MANDOC_IDX, MAXPATHLEN);
+       sz = strlcpy(file, ps.paths[vol], PATH_MAX);
+       assert(sz < PATH_MAX);
+       strlcat(file, "/", PATH_MAX);
+       strlcat(file, MANDOC_IDX, PATH_MAX);
 
        /* Open the index recno(3) database. */
 
@@ -863,8 +862,8 @@ pg_show(const struct req *req, char *path)
                resp_baddb();
        else {
                file[(int)sz] = '\0';
-               strlcat(file, "/", MAXPATHLEN);
-               strlcat(file, cp, MAXPATHLEN);
+               strlcat(file, "/", PATH_MAX);
+               strlcat(file, cp, PATH_MAX);
                if (catm) 
                        catman(req, file);
                else
@@ -973,7 +972,7 @@ int
 main(void)
 {
        int              i;
-       char             buf[MAXPATHLEN];
+       char             buf[PATH_MAX];
        DIR             *cwd;
        struct req       req;
        char            *p, *path, *subpath;
@@ -1010,7 +1009,7 @@ main(void)
 
        memset(&req, 0, sizeof(struct req));
 
-       strlcpy(buf, ".", MAXPATHLEN);
+       strlcpy(buf, ".", PATH_MAX);
        pathgen(cwd, buf, &req);
        closedir(cwd);
 
@@ -1120,8 +1119,8 @@ pathgen(DIR *dir, char *path, struct req *req)
        int              rc;
        size_t           sz, ssz;
 
-       sz = strlcat(path, "/", MAXPATHLEN);
-       if (sz >= MAXPATHLEN) {
+       sz = strlcat(path, "/", PATH_MAX);
+       if (sz >= PATH_MAX) {
                fprintf(stderr, "%s: Path too long", path);
                return;
        } 
@@ -1138,9 +1137,9 @@ pathgen(DIR *dir, char *path, struct req *req)
                        continue;
 
                path[(int)sz] = '\0';
-               ssz = strlcat(path, d->d_name, MAXPATHLEN);
+               ssz = strlcat(path, d->d_name, PATH_MAX);
 
-               if (ssz >= MAXPATHLEN) {
+               if (ssz >= PATH_MAX) {
                        fprintf(stderr, "%s: Path too long", path);
                        return;
                } else if (NULL == (cd = opendir(path))) {
@@ -1187,9 +1186,9 @@ pathgen(DIR *dir, char *path, struct req *req)
                        continue;
 
                path[(int)sz] = '\0';
-               ssz = strlcat(path, d->d_name, MAXPATHLEN);
+               ssz = strlcat(path, d->d_name, PATH_MAX);
 
-               if (ssz >= MAXPATHLEN) {
+               if (ssz >= PATH_MAX) {
                        fprintf(stderr, "%s: Path too long", path);
                        return;
                } else if (NULL == (cd = opendir(path))) {