update after recent code changes

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index 888c8db5dad975e848421296d950a3d3cf9a088b..61b2c7e05077435ad7f6467071f43b17748269d8 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*     $Id: manpath.c,v 1.10 2013/05/29 22:48:10 schwarze Exp $ */
+/*     $Id: manpath.c,v 1.15 2014/04/23 21:06:41 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -19,10 +19,6 @@
 #include "config.h"
 #endif
 
-#ifdef USE_MANPATH
-#include <sys/param.h>
-#endif
-
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
@@ -30,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mandoc.h"
+#include "mandoc_aux.h"
 #include "manpath.h"
 
 #define MAN_CONF_FILE  "/etc/man.conf"
@@ -44,7 +40,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
                char *defp, char *auxp)
 {
 #ifdef USE_MANPATH
-       char             cmd[(MAXPATHLEN * 3) + 20];
+       char             cmd[(PATH_MAX * 3) + 20];
        FILE            *stream;
        char            *buf;
        size_t           sz, bsz;
@@ -173,9 +169,8 @@ manpath_add(struct manpaths *dirs, const char *dir)
                if (0 == strcmp(dirs->paths[i], dir))
                        return;
 
-       dirs->paths = mandoc_realloc
-               (dirs->paths,
-                (dirs->sz + 1) * sizeof(char *));
+       dirs->paths = mandoc_reallocarray(dirs->paths,
+           dirs->sz + 1, sizeof(char *));
 
        dirs->paths[dirs->sz++] = mandoc_strdup(cp);
 }
@@ -213,7 +208,7 @@ manpath_manconf(struct manpaths *dirs, const char *file)
                if (strncmp(MAN_CONF_KEY, p, keysz))
                        continue;
                p += keysz;
-               while (isspace(*p))
+               while (isspace((unsigned char)*p))
                        p++;
                if ('\0' == *p)
                        continue;