X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/f1120c542b0577e236401251c9af324555049408..157acc96e57eb848d9e9d3918f644f9bb1a463bc:/manpath.c diff --git a/manpath.c b/manpath.c index e22aa926..c33e0ecf 100644 --- a/manpath.c +++ b/manpath.c @@ -1,4 +1,4 @@ -/* $Id: manpath.c,v 1.9 2012/06/08 10:32:40 kristaps Exp $ */ +/* $Id: manpath.c,v 1.12 2013/11/21 01:49:18 schwarze Exp $ */ /* * Copyright (c) 2011 Ingo Schwarze * Copyright (c) 2011 Kristaps Dzonsons @@ -19,8 +19,6 @@ #include "config.h" #endif -#include - #include #include #include @@ -42,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; @@ -90,8 +88,8 @@ manpath_parse(struct manpaths *dirs, const char *file, char *insert; /* Always prepend -m. */ - manpath_parseline(dirs, auxp); - + manpath_parseline(dirs, auxp); + /* If -M is given, it overrides everything else. */ if (NULL != defp) { manpath_parseline(dirs, defp); @@ -211,7 +209,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;