=================================================================== RCS file: /cvs/mandoc/manpath.c,v retrieving revision 1.9 retrieving revision 1.11 diff -u -p -r1.9 -r1.11 --- mandoc/manpath.c 2012/06/08 10:32:40 1.9 +++ mandoc/manpath.c 2013/06/05 02:00:26 1.11 @@ -1,4 +1,4 @@ -/* $Id: manpath.c,v 1.9 2012/06/08 10:32:40 kristaps Exp $ */ +/* $Id: manpath.c,v 1.11 2013/06/05 02:00:26 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);