Improve build system and autodetection.

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index f301c0d63afefac47bb2cef8170e811d77072b4a..0e0a6017230d65ff979f4e335c440597e68a5283 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*     $Id: manpath.c,v 1.13 2014/03/23 11:25:26 schwarze Exp $ */
+/*     $Id: manpath.c,v 1.17 2014/08/16 19:00:01 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -15,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -39,7 +39,7 @@ void
 manpath_parse(struct manpaths *dirs, const char *file,
                char *defp, char *auxp)
 {
-#ifdef USE_MANPATH
+#if HAVE_MANPATH
        char             cmd[(PATH_MAX * 3) + 20];
        FILE            *stream;
        char            *buf;
@@ -169,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);
 }