bugfix: make sure all variables are properly initialized

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 4432d6b44b24ef595362acb2dcc27a5b50b763fd..35b20160690920241a7ec947fae8e2de598b5edd 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,6 +1,6 @@
-/*     $Id: cgi.c,v 1.40 2012/03/23 09:03:07 kristaps Exp $ */
+/*     $Id: cgi.c,v 1.50 2014/03/23 12:19:03 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
  *
  * 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 "config.h"
 #endif
 

-#include <sys/param.h>

 #include <sys/wait.h>
 
 #include <assert.h>
 #include <sys/wait.h>
 
 #include <assert.h>


@@ -35,15 +34,23 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

+#if defined(__sun)
+/* for stat() */
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+

 #include "apropos_db.h"
 #include "mandoc.h"
 #include "apropos_db.h"
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #include "mdoc.h"
 #include "man.h"
 #include "main.h"
 #include "manpath.h"
 #include "mandocdb.h"
 
 #include "mdoc.h"
 #include "man.h"
 #include "main.h"
 #include "manpath.h"
 #include "mandocdb.h"
 

-#ifdef __linux__
+#if defined(__linux__) || defined(__sun)

 # include <db_185.h>
 #else
 # include <db.h>
 # include <db_185.h>
 #else
 # include <db.h>


@@ -495,15 +502,22 @@ resp_baddb(void)
 static void
 resp_search(struct res *r, size_t sz, void *arg)
 {
 static void
 resp_search(struct res *r, size_t sz, void *arg)
 {

-       int               i;
+       size_t           i, matched;

        const struct req *req;
 
        req = (const struct req *)arg;
 
        if (sz > 0)
                assert(req->q.manroot >= 0);
        const struct req *req;
 
        req = (const struct req *)arg;
 
        if (sz > 0)
                assert(req->q.manroot >= 0);

+
+       for (matched = i = 0; i < sz; i++)
+               if (r[i].matched)
+                       matched++;

        
        

-       if (1 == sz) {
+       if (1 == matched) {
+               for (i = 0; i < sz; i++)
+                       if (r[i].matched)
+                               break;

                /*
                 * If we have just one result, then jump there now
                 * without any delay.
                /*
                 * If we have just one result, then jump there now
                 * without any delay.


@@ -511,21 +525,19 @@ resp_search(struct res *r, size_t sz, void *arg)
                puts("Status: 303 See Other");
                printf("Location: http://%s%s/show/%d/%u/%u.html?",
                                host, progname, req->q.manroot,
                puts("Status: 303 See Other");
                printf("Location: http://%s%s/show/%d/%u/%u.html?",
                                host, progname, req->q.manroot,

-                               r[0].volume, r[0].rec);
+                               r[i].volume, r[i].rec);

                http_printquery(req);
                puts("\n"
                     "Content-Type: text/html; charset=utf-8\n");
                return;
        }
 
                http_printquery(req);
                puts("\n"
                     "Content-Type: text/html; charset=utf-8\n");
                return;
        }
 

-       qsort(r, sz, sizeof(struct res), cmp);
-

        resp_begin_html(200, NULL);
        resp_searchform(req);
 
        puts("<DIV CLASS=\"results\">");
 
        resp_begin_html(200, NULL);
        resp_searchform(req);
 
        puts("<DIV CLASS=\"results\">");
 

-       if (0 == sz) {
+       if (0 == matched) {

                puts("<P>\n"
                     "No results found.\n"
                     "</P>\n"
                puts("<P>\n"
                     "No results found.\n"
                     "</P>\n"


@@ -534,9 +546,13 @@ resp_search(struct res *r, size_t sz, void *arg)
                return;
        }
 
                return;
        }
 

+       qsort(r, sz, sizeof(struct res), cmp);
+

        puts("<TABLE>");
 
        puts("<TABLE>");
 

-       for (i = 0; i < (int)sz; i++) {
+       for (i = 0; i < sz; i++) {
+               if ( ! r[i].matched)
+                       continue;

                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"
                       "<A HREF=\"%s/show/%d/%u/%u.html?", 
                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"
                       "<A HREF=\"%s/show/%d/%u/%u.html?", 


@@ -717,14 +733,14 @@ format(const struct req *req, const char *file)
        struct man      *man;
        void            *vp;
        enum mandoclevel rc;
        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;
        }
 
 
        if (-1 == (fd = open(file, O_RDONLY, 0))) {
                resp_baddb();
                return;
        }
 

-       mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, NULL);

        rc = mparse_readfd(mp, fd, file);
        close(fd);
 
        rc = mparse_readfd(mp, fd, file);
        close(fd);
 


@@ -734,11 +750,11 @@ format(const struct req *req, const char *file)
        }
 
        snprintf(opts, sizeof(opts), "fragment,"
        }
 
        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);
 
                        /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/,
                        progname);
 

-       mparse_result(mp, &mdoc, &man);
+       mparse_result(mp, &mdoc, &man, NULL);

        if (NULL == man && NULL == mdoc) {
                resp_baddb();
                mparse_free(mp);
        if (NULL == man && NULL == mdoc) {
                resp_baddb();
                mparse_free(mp);


@@ -768,7 +784,7 @@ pg_show(const struct req *req, char *path)
        struct manpaths  ps;
        size_t           sz;
        char            *sub;
        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;
        const char      *cp;
        int              rc, catm;
        unsigned int     vol, rec, mr;


@@ -822,10 +838,10 @@ pg_show(const struct req *req, char *path)
                goto out;
        }
 
                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. */
 
 
        /* Open the index recno(3) database. */
 


@@ -854,8 +870,8 @@ pg_show(const struct req *req, char *path)
                resp_baddb();
        else {
                file[(int)sz] = '\0';
                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
                if (catm) 
                        catman(req, file);
                else


@@ -870,10 +886,11 @@ out:
 static void
 pg_search(const struct req *req, char *path)
 {
 static void
 pg_search(const struct req *req, char *path)
 {

-       size_t            tt;
+       size_t            tt, ressz;

        struct manpaths   ps;
        int               i, sz, rc;
        const char       *ep, *start;
        struct manpaths   ps;
        int               i, sz, rc;
        const char       *ep, *start;

+       struct res      *res;

        char            **cp;
        struct opts       opt;
        struct expr      *expr;
        char            **cp;
        struct opts       opt;
        struct expr      *expr;


@@ -891,6 +908,8 @@ pg_search(const struct req *req, char *path)
        rc       = -1;
        sz       = 0;
        cp       = NULL;
        rc       = -1;
        sz       = 0;
        cp       = NULL;

+       ressz    = 0;
+       res      = NULL;

 
        /*
         * Begin by chdir()ing into the root of the manpath.
 
        /*
         * Begin by chdir()ing into the root of the manpath.


@@ -938,20 +957,21 @@ pg_search(const struct req *req, char *path)
 
        if (NULL != expr)
                rc = apropos_search
 
        if (NULL != expr)
                rc = apropos_search

-                       (ps.sz, ps.paths, &opt,
-                        expr, tt, (void *)req, resp_search);
+                       (ps.sz, ps.paths, &opt, expr, tt, 
+                        (void *)req, &ressz, &res, resp_search);

 
        /* ...unless errors occured. */
 
        if (0 == rc)
                resp_baddb();
        else if (-1 == rc)
 
        /* ...unless errors occured. */
 
        if (0 == rc)
                resp_baddb();
        else if (-1 == rc)

-               resp_search(NULL, 0, (void *)req);
+               resp_search(NULL, 0, NULL);

 
        for (i = 0; i < sz; i++)
                free(cp[i]);
 
        free(cp);
 
        for (i = 0; i < sz; i++)
                free(cp[i]);
 
        free(cp);

+       resfree(res, ressz);

        exprfree(expr);
        manpath_free(&ps);
 }
        exprfree(expr);
        manpath_free(&ps);
 }


@@ -960,7 +980,7 @@ int
 main(void)
 {
        int              i;
 main(void)
 {
        int              i;

-       char             buf[MAXPATHLEN];
+       char             buf[PATH_MAX];

        DIR             *cwd;
        struct req       req;
        char            *p, *path, *subpath;
        DIR             *cwd;
        struct req       req;
        char            *p, *path, *subpath;


@@ -997,7 +1017,7 @@ main(void)
 
        memset(&req, 0, sizeof(struct req));
 
 
        memset(&req, 0, sizeof(struct req));
 

-       strlcpy(buf, ".", MAXPATHLEN);
+       strlcpy(buf, ".", PATH_MAX);

        pathgen(cwd, buf, &req);
        closedir(cwd);
 
        pathgen(cwd, buf, &req);
        closedir(cwd);
 


@@ -1085,11 +1105,20 @@ static int
 pathstop(DIR *dir)
 {
        struct dirent   *d;
 pathstop(DIR *dir)
 {
        struct dirent   *d;

+#if defined(__sun)
+       struct stat      sb;
+#endif

 
 

-       while (NULL != (d = readdir(dir)))
+       while (NULL != (d = readdir(dir))) {
+#if defined(__sun)
+               stat(d->d_name, &sb);
+               if (S_IFREG & sb.st_mode)
+#else

                if (DT_REG == d->d_type)
                if (DT_REG == d->d_type)

+#endif

                        if (0 == strcmp(d->d_name, "catman.conf"))
                                return(1);
                        if (0 == strcmp(d->d_name, "catman.conf"))
                                return(1);

+  }

 
        return(0);
 }
 
        return(0);
 }


@@ -1106,9 +1135,12 @@ pathgen(DIR *dir, char *path, struct req *req)
        DIR             *cd;
        int              rc;
        size_t           sz, ssz;
        DIR             *cd;
        int              rc;
        size_t           sz, ssz;

+#if defined(__sun)
+       struct stat      sb;
+#endif

 
 

-       sz = strlcat(path, "/", MAXPATHLEN);
-       if (sz >= MAXPATHLEN) {
+       sz = strlcat(path, "/", PATH_MAX);
+       if (sz >= PATH_MAX) {

                fprintf(stderr, "%s: Path too long", path);
                return;
        } 
                fprintf(stderr, "%s: Path too long", path);
                return;
        } 


@@ -1121,13 +1153,19 @@ pathgen(DIR *dir, char *path, struct req *req)
 
        rc = 0;
        while (0 == rc && NULL != (d = readdir(dir))) {
 
        rc = 0;
        while (0 == rc && NULL != (d = readdir(dir))) {

-               if (DT_DIR != d->d_type || strcmp(d->d_name, "etc"))
+#if defined(__sun)
+               stat(d->d_name, &sb);
+               if (!(S_IFDIR & sb.st_mode)
+#else
+               if (DT_DIR != d->d_type
+#endif
+        || strcmp(d->d_name, "etc"))

                        continue;
 
                path[(int)sz] = '\0';
                        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))) {
                        fprintf(stderr, "%s: Path too long", path);
                        return;
                } else if (NULL == (cd = opendir(path))) {


@@ -1170,13 +1208,19 @@ pathgen(DIR *dir, char *path, struct req *req)
 
        rewinddir(dir);
        while (NULL != (d = readdir(dir))) {
 
        rewinddir(dir);
        while (NULL != (d = readdir(dir))) {

-               if (DT_DIR != d->d_type || '.' == d->d_name[0])
+#if defined(__sun)
+               stat(d->d_name, &sb);
+               if (!(S_IFDIR & sb.st_mode)
+#else
+               if (DT_DIR != d->d_type
+#endif
+        || '.' == d->d_name[0])

                        continue;
 
                path[(int)sz] = '\0';
                        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))) {
                        fprintf(stderr, "%s: Path too long", path);
                        return;
                } else if (NULL == (cd = opendir(path))) {