Render roff escape sequences contained in manual page descriptions

[mandoc.git] / cgi.c

diff --git a/cgi.c b/cgi.c
index 002855d799aa027720b81cd6c18bf58d98161e01..53fd21caef40d4f7eced33f6ab981e131ddca5ca 100644 (file)
--- a/cgi.c
+++ b/cgi.c
@@ -1,6 +1,6 @@
-/*     $Id: cgi.c,v 1.34 2011/12/16 08:04:34 kristaps Exp $ */
+/*     $Id: cgi.c,v 1.51 2014/04/23 21:40:47 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,14 +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 "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>


@@ -68,7 +76,6 @@ struct        query {
        const char      *sec; /* manual section */
        const char      *expr; /* unparsed expression string */
        int              manroot; /* manroot index (or -1)*/
        const char      *sec; /* manual section */
        const char      *expr; /* unparsed expression string */
        int              manroot; /* manroot index (or -1)*/

-       int              whatis; /* whether whatis mode */

        int              legacy; /* whether legacy mode */
 };
 
        int              legacy; /* whether legacy mode */
 };
 


@@ -84,9 +91,13 @@ static       void             catman(const struct req *, const char *);
 static int              cmp(const void *, const void *);
 static void             format(const struct req *, const char *);
 static void             html_print(const char *);
 static int              cmp(const void *, const void *);
 static void             format(const struct req *, const char *);
 static void             html_print(const char *);

+static void             html_printquery(const struct req *);

 static void             html_putchar(char);
 static int              http_decode(char *);
 static void             http_parse(struct req *, char *);
 static void             html_putchar(char);
 static int              http_decode(char *);
 static void             http_parse(struct req *, char *);

+static void             http_print(const char *);
+static void             http_putchar(char);
+static void             http_printquery(const struct req *);

 static int              pathstop(DIR *);
 static void             pathgen(DIR *, char *, struct req *);
 static void             pg_index(const struct req *, char *);
 static int              pathstop(DIR *);
 static void             pathgen(DIR *, char *, struct req *);
 static void             pg_index(const struct req *, char *);


@@ -130,7 +141,7 @@ atou(const char *buf, unsigned *v)
                return(0);
        if ((errno == ERANGE && (lval == LONG_MAX || 
                                        lval == LONG_MIN)) ||
                return(0);
        if ((errno == ERANGE && (lval == LONG_MAX || 
                                        lval == LONG_MIN)) ||

-                       (lval > UINT_MAX || lval < 0))
+                       (lval > INT_MAX || lval < 0))

                return(0);
 
        *v = (unsigned int)lval;
                return(0);
 
        *v = (unsigned int)lval;


@@ -163,6 +174,40 @@ html_putchar(char c)
                break;
        }
 }
                break;
        }
 }

+static void
+http_printquery(const struct req *req)
+{
+
+       printf("&expr=");
+       http_print(req->q.expr ? req->q.expr : "");
+       printf("&sec=");
+       http_print(req->q.sec ? req->q.sec : "");
+       printf("&arch=");
+       http_print(req->q.arch ? req->q.arch : "");
+}
+
+
+static void
+html_printquery(const struct req *req)
+{
+
+       printf("&amp;expr=");
+       html_print(req->q.expr ? req->q.expr : "");
+       printf("&amp;sec=");
+       html_print(req->q.sec ? req->q.sec : "");
+       printf("&amp;arch=");
+       html_print(req->q.arch ? req->q.arch : "");
+}
+
+static void
+http_print(const char *p)
+{
+
+       if (NULL == p)
+               return;
+       while ('\0' != *p)
+               http_putchar(*p++);
+}

 
 /*
  * Call through to html_putchar().
 
 /*
  * Call through to html_putchar().


@@ -187,51 +232,31 @@ static void
 http_parse(struct req *req, char *p)
 {
        char            *key, *val, *manroot;
 http_parse(struct req *req, char *p)
 {
        char            *key, *val, *manroot;

-       size_t           sz;

        int              i, legacy;
 
        memset(&req->q, 0, sizeof(struct query));
 
        int              i, legacy;
 
        memset(&req->q, 0, sizeof(struct query));
 

-       req->q.whatis = 1;

        legacy = -1;
        manroot = NULL;
 
        legacy = -1;
        manroot = NULL;
 

-       while (p && '\0' != *p) {
-               while (' ' == *p)
-                       p++;
-
+       while ('\0' != *p) {

                key = p;
                val = NULL;
 
                key = p;
                val = NULL;
 

-               if (NULL != (p = strchr(p, '='))) {
+               p += (int)strcspn(p, ";&");
+               if ('\0' != *p)

                        *p++ = '\0';
                        *p++ = '\0';

-                       val = p;
-
-                       sz = strcspn(p, ";&");
-                       /* LINTED */
-                       p += sz;
-
-                       if ('\0' != *p)
-                               *p++ = '\0';
-               } else {
-                       p = key;
-                       sz = strcspn(p, ";&");
-                       /* LINTED */
-                       p += sz;
-
-                       if ('\0' != *p)
-                               p++;
-                       continue;
-               }
+               if (NULL != (val = strchr(key, '=')))
+                       *val++ = '\0';

 
 

-               if ('\0' == *key || '\0' == *val)
+               if ('\0' == *key || NULL == val || '\0' == *val)

                        continue;
 
                /* Just abort handling. */
 
                if ( ! http_decode(key))
                        break;
                        continue;
 
                /* Just abort handling. */
 
                if ( ! http_decode(key))
                        break;

-               if ( ! http_decode(val))
+               if (NULL != val && ! http_decode(val))

                        break;
 
                if (0 == strcmp(key, "expr"))
                        break;
 
                if (0 == strcmp(key, "expr"))


@@ -248,19 +273,11 @@ http_parse(struct req *req, char *p)
                        manroot = val;
                else if (0 == strcmp(key, "apropos"))
                        legacy = 0 == strcmp(val, "0");
                        manroot = val;
                else if (0 == strcmp(key, "apropos"))
                        legacy = 0 == strcmp(val, "0");

-               else if (0 == strcmp(key, "op"))
-                       req->q.whatis = 0 == strcasecmp(val, "whatis");

        }
 
        /* Test for old man.cgi compatibility mode. */
 
        }
 
        /* Test for old man.cgi compatibility mode. */
 

-       if (legacy == 0) {
-               req->q.whatis = 0;
-               req->q.legacy = 1;
-       } else if (legacy > 0) {
-               req->q.legacy = 1;
-               req->q.whatis = 1;
-       }
+       req->q.legacy = legacy > 0;

 
        /* 
         * Section "0" means no section when in legacy mode.
 
        /* 
         * Section "0" means no section when in legacy mode.


@@ -284,6 +301,20 @@ http_parse(struct req *req, char *p)
        }
 }
 
        }
 }
 

+static void
+http_putchar(char c)
+{
+
+       if (isalnum((unsigned char)c)) {
+               putchar((unsigned char)c);
+               return;
+       } else if (' ' == c) {
+               putchar('+');
+               return;
+       }
+       printf("%%%.2x", c);
+}
+

 /*
  * HTTP-decode a string.  The standard explanation is that this turns
  * "%4e+foo" into "n foo" in the regular way.  This is done in-place
 /*
  * HTTP-decode a string.  The standard explanation is that this turns
  * "%4e+foo" into "n foo" in the regular way.  This is done in-place


@@ -374,10 +405,8 @@ resp_searchform(const struct req *req)
               "<FORM ACTION=\"%s/search.html\" METHOD=\"get\">\n"
               "<FIELDSET>\n"
               "<LEGEND>Search Parameters</LEGEND>\n"
               "<FORM ACTION=\"%s/search.html\" METHOD=\"get\">\n"
               "<FIELDSET>\n"
               "<LEGEND>Search Parameters</LEGEND>\n"

-              "<INPUT TYPE=\"submit\" NAME=\"op\""
-              " VALUE=\"Whatis\"> or \n"
-              "<INPUT TYPE=\"submit\" NAME=\"op\""
-              " VALUE=\"apropos\"> for manuals satisfying \n"
+              "<INPUT TYPE=\"submit\" "
+              " VALUE=\"Search\"> for manuals satisfying \n"

               "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"",
               progname);
        html_print(req->q.expr ? req->q.expr : "");
               "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"",
               progname);
        html_print(req->q.expr ? req->q.expr : "");


@@ -473,60 +502,64 @@ 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;
        const struct req *req;
 
        req = (const struct req *)arg;

-       assert(req->q.manroot >= 0);

 
 

-       if (1 == sz) {
+       if (sz > 0)
+               assert(req->q.manroot >= 0);
+
+       for (matched = i = 0; i < sz; i++)
+               if (r[i].matched)
+                       matched++;
+       
+       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.
                 */
                puts("Status: 303 See Other");
                /*
                 * If we have just one result, then jump there now
                 * without any delay.
                 */
                puts("Status: 303 See Other");

-               printf("Location: http://%s%s/show/%d/%u/%u.html\n",
+               printf("Location: http://%s%s/show/%d/%u/%u.html?",

                                host, progname, req->q.manroot,
                                host, progname, req->q.manroot,

-                               r[0].volume, r[0].rec);
-               puts("Content-Type: text/html; charset=utf-8\n");
+                               r[i].volume, r[i].rec);
+               http_printquery(req);
+               puts("\n"
+                    "Content-Type: text/html; charset=utf-8\n");

                return;
        }
 
                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) {
-               printf("<P>\n"
-                      "No %s results found.\n",
-                      req->q.whatis ? "whatis" : "apropos");
-               if (req->q.whatis) {
-                       printf("(Try <A HREF=\"%s/search.html?"
-                              "op=apropos&amp;expr=", progname);
-                       html_print(req->q.expr ? req->q.expr : "");
-                       printf("&amp;sec=");
-                       html_print(req->q.sec ? req->q.sec : "");
-                       printf("&amp;arch=");
-                       html_print(req->q.arch ? req->q.arch : "");
-                       puts("\">apropos</A>?)");
-               }
-               puts("</P>");
-               puts("</DIV>");
+       if (0 == matched) {
+               puts("<P>\n"
+                    "No results found.\n"
+                    "</P>\n"
+                    "</DIV>");

                resp_end_html();
                return;
        }
 
                resp_end_html();
                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"
                printf("<TR>\n"
                       "<TD CLASS=\"title\">\n"

-                      "<A HREF=\"%s/show/%d/%u/%u.html\">", 
+                      "<A HREF=\"%s/show/%d/%u/%u.html?", 

                                progname, req->q.manroot,
                                r[i].volume, r[i].rec);
                                progname, req->q.manroot,
                                r[i].volume, r[i].rec);

+               html_printquery(req);
+               printf("\">");

                html_print(r[i].title);
                putchar('(');
                html_print(r[i].cat);
                html_print(r[i].title);
                putchar('(');
                html_print(r[i].cat);


@@ -700,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);
 


@@ -717,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);


@@ -751,9 +784,9 @@ 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];
-       const char      *fn, *cp;
-       int              rc;
+       char             file[PATH_MAX];
+       const char      *cp;
+       int              rc, catm;

        unsigned int     vol, rec, mr;
        DB              *idx;
        DBT              key, val;
        unsigned int     vol, rec, mr;
        DB              *idx;
        DBT              key, val;


@@ -805,9 +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, "/mandoc.index", 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. */
 


@@ -824,21 +858,21 @@ pg_show(const struct req *req, char *path)
        if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) {
                rc < 0 ? resp_baddb() : resp_error400();
                goto out;
        if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) {
                rc < 0 ? resp_baddb() : resp_error400();
                goto out;

-       } 
+       } else if (0 == val.size) {
+               resp_baddb();
+               goto out;
+       }

 
        cp = (char *)val.data;
 
        cp = (char *)val.data;

+       catm = 'c' == *cp++;

 
 

-       if (NULL == (fn = memchr(cp, '\0', val.size)))
-               resp_baddb();
-       else if (++fn - cp >= (int)val.size)
-               resp_baddb();
-       else if (NULL == memchr(fn, '\0', val.size - (fn - cp)))
+       if (NULL == memchr(cp, '\0', val.size - 1)) 

                resp_baddb();
        else {
                file[(int)sz] = '\0';
                resp_baddb();
        else {
                file[(int)sz] = '\0';

-               strlcat(file, "/", MAXPATHLEN);
-               strlcat(file, fn, MAXPATHLEN);
-               if (0 == strcmp(cp, "cat"))
+               strlcat(file, "/", PATH_MAX);
+               strlcat(file, cp, PATH_MAX);
+               if (catm) 

                        catman(req, file);
                else
                        format(req, file);
                        catman(req, file);
                else
                        format(req, file);


@@ -852,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;


@@ -873,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.


@@ -899,7 +936,7 @@ pg_search(const struct req *req, char *path)
                ep++;
 
        while (ep && '\0' != *ep) {
                ep++;
 
        while (ep && '\0' != *ep) {

-               cp = mandoc_realloc(cp, (sz + 1) * sizeof(char *));
+               cp = mandoc_reallocarray(cp, sz + 1, sizeof(char *));

                start = ep;
                while ('\0' != *ep && ! isspace((unsigned char)*ep))
                        ep++;
                start = ep;
                while ('\0' != *ep && ! isspace((unsigned char)*ep))
                        ep++;


@@ -915,25 +952,26 @@ pg_search(const struct req *req, char *path)
         * The resp_search() function is called with the results.
         */
 
         * The resp_search() function is called with the results.
         */
 

-       expr = req->q.whatis ? 
+       expr = req->q.legacy ? 

                termcomp(sz, cp, &tt) : exprcomp(sz, cp, &tt);
 
        if (NULL != expr)
                rc = apropos_search
                termcomp(sz, cp, &tt) : exprcomp(sz, cp, &tt);
 
        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);
 }


@@ -942,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;


@@ -979,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);
 


@@ -1067,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);
 }


@@ -1088,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;
        } 


@@ -1103,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))) {


@@ -1124,9 +1180,8 @@ pathgen(DIR *dir, char *path, struct req *req)
        if (rc > 0) {
                /* This also strips the trailing slash. */
                path[(int)--sz] = '\0';
        if (rc > 0) {
                /* This also strips the trailing slash. */
                path[(int)--sz] = '\0';

-               req->p = mandoc_realloc
-                       (req->p, 
-                        (req->psz + 1) * sizeof(struct paths));
+               req->p = mandoc_reallocarray(req->p, 
+                   req->psz + 1, sizeof(struct paths));

                /*
                 * Strip out the leading "./" unless we're just a ".",
                 * in which case use an empty string as our name.
                /*
                 * Strip out the leading "./" unless we're just a ".",
                 * in which case use an empty string as our name.


@@ -1152,13 +1207,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))) {