Make the calltree a bit easier to understand by giving the

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index 7ce672e22ff22eb42628533159ee054728a4b84d..61b2c7e05077435ad7f6467071f43b17748269d8 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*     $Id: manpath.c,v 1.4 2011/11/26 22:38:11 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>
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>


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

-#include <sys/types.h>

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


@@ -27,33 +26,120 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "mandoc.h"
+#include "mandoc_aux.h"

 #include "manpath.h"
 
 #define MAN_CONF_FILE  "/etc/man.conf"
 #define MAN_CONF_KEY   "_whatdb"
 
 static void     manpath_add(struct manpaths *, const char *);
 #include "manpath.h"
 
 #define MAN_CONF_FILE  "/etc/man.conf"
 #define MAN_CONF_KEY   "_whatdb"
 
 static void     manpath_add(struct manpaths *, const char *);

+static void     manpath_parseline(struct manpaths *, char *);

 
 void
 
 void

-manpath_parse(struct manpaths *dirs, char *defp, char *auxp)
+manpath_parse(struct manpaths *dirs, const char *file,
+               char *defp, char *auxp)

 {
 {

+#ifdef USE_MANPATH
+       char             cmd[(PATH_MAX * 3) + 20];
+       FILE            *stream;
+       char            *buf;
+       size_t           sz, bsz;
+
+       strlcpy(cmd, "manpath", sizeof(cmd));
+       if (file) {
+               strlcat(cmd, " -C ", sizeof(cmd));
+               strlcat(cmd, file, sizeof(cmd));
+       }
+       if (auxp) {
+               strlcat(cmd, " -m ", sizeof(cmd));
+               strlcat(cmd, auxp, sizeof(cmd));
+       }
+       if (defp) {
+               strlcat(cmd, " -M ", sizeof(cmd));
+               strlcat(cmd, defp, sizeof(cmd));
+       }
+
+       /* Open manpath(1).  Ignore errors. */
+
+       stream = popen(cmd, "r");
+       if (NULL == stream)
+               return;
+
+       buf = NULL;
+       bsz = 0;
+
+       /* Read in as much output as we can. */
+
+       do {
+               buf = mandoc_realloc(buf, bsz + 1024);
+               sz = fread(buf + bsz, 1, 1024, stream);
+               bsz += sz;
+       } while (sz > 0);

 
 

+       if ( ! ferror(stream) && feof(stream) &&
+                       bsz && '\n' == buf[bsz - 1]) {
+               buf[bsz - 1] = '\0';
+               manpath_parseline(dirs, buf);
+       }
+
+       free(buf);
+       pclose(stream);
+#else
+       char            *insert;
+
+       /* Always prepend -m. */

        manpath_parseline(dirs, auxp);
 
        manpath_parseline(dirs, auxp);
 

-       if (NULL == defp)
-               defp = getenv("MANPATH");
+       /* If -M is given, it overrides everything else. */
+       if (NULL != defp) {
+               manpath_parseline(dirs, defp);
+               return;
+       }
+
+       /* MANPATH and man.conf(5) cooperate. */
+       defp = getenv("MANPATH");
+       if (NULL == file)
+               file = MAN_CONF_FILE;
+
+       /* No MANPATH; use man.conf(5) only. */
+       if (NULL == defp || '\0' == defp[0]) {
+               manpath_manconf(dirs, file);
+               return;
+       }

 
 

-       if (NULL == defp)
-               manpath_parseconf(dirs);
-       else
+       /* Prepend man.conf(5) to MANPATH. */
+       if (':' == defp[0]) {
+               manpath_manconf(dirs, file);

                manpath_parseline(dirs, defp);
                manpath_parseline(dirs, defp);

+               return;
+       }
+
+       /* Append man.conf(5) to MANPATH. */
+       if (':' == defp[strlen(defp) - 1]) {
+               manpath_parseline(dirs, defp);
+               manpath_manconf(dirs, file);
+               return;
+       }
+
+       /* Insert man.conf(5) into MANPATH. */
+       insert = strstr(defp, "::");
+       if (NULL != insert) {
+               *insert++ = '\0';
+               manpath_parseline(dirs, defp);
+               manpath_manconf(dirs, file);
+               manpath_parseline(dirs, insert + 1);
+               return;
+       }
+
+       /* MANPATH overrides man.conf(5) completely. */
+       manpath_parseline(dirs, defp);
+#endif

 }
 
 /*
  * Parse a FULL pathname from a colon-separated list of arrays.
  */
 }
 
 /*
  * Parse a FULL pathname from a colon-separated list of arrays.
  */

-void
+static void

 manpath_parseline(struct manpaths *dirs, char *path)
 {
        char    *dir;
 manpath_parseline(struct manpaths *dirs, char *path)
 {
        char    *dir;


@@ -74,7 +160,7 @@ manpath_add(struct manpaths *dirs, const char *dir)
 {
        char             buf[PATH_MAX];
        char            *cp;
 {
        char             buf[PATH_MAX];
        char            *cp;

-       int              i;
+       size_t           i;

 
        if (NULL == (cp = realpath(dir, buf)))
                return;
 
        if (NULL == (cp = realpath(dir, buf)))
                return;


@@ -83,55 +169,16 @@ manpath_add(struct manpaths *dirs, const char *dir)
                if (0 == strcmp(dirs->paths[i], dir))
                        return;
 
                if (0 == strcmp(dirs->paths[i], dir))
                        return;
 

-       dirs->paths = mandoc_realloc
-               (dirs->paths,
-                ((size_t)dirs->sz + 1) * sizeof(char *));
+       dirs->paths = mandoc_reallocarray(dirs->paths,
+           dirs->sz + 1, sizeof(char *));

 
        dirs->paths[dirs->sz++] = mandoc_strdup(cp);
 }
 
 
        dirs->paths[dirs->sz++] = mandoc_strdup(cp);
 }
 

-void
-manpath_parseconf(struct manpaths *dirs)
-{
-#ifdef USE_MANPATH
-       FILE            *stream;
-       char            *buf;
-       size_t           sz, bsz;
-
-       /* Open manpath(1).  Ignore errors. */
-
-       stream = popen("manpath", "r");
-       if (NULL == stream)
-               return;
-
-       buf = NULL;
-       bsz = 0;
-
-       /* Read in as much output as we can. */
-
-       do {
-               buf = mandoc_realloc(buf, bsz + 1024);
-               sz = fread(buf + (int)bsz, 1, 1024, stream);
-               bsz += sz;
-       } while (sz > 0);
-
-       if ( ! ferror(stream) && feof(stream) &&
-                       bsz && '\n' == buf[bsz - 1]) {
-               buf[bsz - 1] = '\0';
-               manpath_parseline(dirs, buf);
-       }
-
-       free(buf);
-       pclose(stream);
-#else
-       manpath_manconf(MAN_CONF_FILE, dirs);
-#endif
-}
-

 void
 manpath_free(struct manpaths *p)
 {
 void
 manpath_free(struct manpaths *p)
 {

-       int              i;
+       size_t           i;

 
        for (i = 0; i < p->sz; i++)
                free(p->paths[i]);
 
        for (i = 0; i < p->sz; i++)
                free(p->paths[i]);


@@ -140,7 +187,7 @@ manpath_free(struct manpaths *p)
 }
 
 void
 }
 
 void

-manpath_manconf(const char *file, struct manpaths *dirs)
+manpath_manconf(struct manpaths *dirs, const char *file)

 {
        FILE            *stream;
        char            *p, *q;
 {
        FILE            *stream;
        char            *p, *q;


@@ -161,7 +208,7 @@ manpath_manconf(const char *file, struct manpaths *dirs)
                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;