Keep words after .Ic together in a single argument.

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index e22aa9268a8c218ca32beac99e81a4186d49eb92..c33e0ecf469c3cb501d4293e6b8b084c1f1b9bc2 100644 (file)
--- 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 <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>


@@ -19,8 +19,6 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-

 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>


@@ -42,7 +40,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
                char *defp, char *auxp)
 {
 #ifdef USE_MANPATH
                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;
        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. */
        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);
        /* 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;
                if (strncmp(MAN_CONF_KEY, p, keysz))
                        continue;
                p += keysz;

-               while (isspace(*p))
+               while (isspace((unsigned char)*p))

                        p++;
                if ('\0' == *p)
                        continue;
                        p++;
                if ('\0' == *p)
                        continue;