Fix an obvious bug found during the /* FALLTHROUGH */ cleanup:

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index c33e0ecf469c3cb501d4293e6b8b084c1f1b9bc2..f912e76694bf85061efb8929643aa6b46eb7491c 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,45 +1,47 @@
-/*     $Id: manpath.c,v 1.12 2013/11/21 01:49:18 schwarze Exp $ */
+/*     $Id: manpath.c,v 1.27 2015/10/11 21:12:55 schwarze Exp $        */

 /*
 /*

- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * 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"
 #include "config.h"

-#endif

 
 

-#include <assert.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+

 #include <ctype.h>
 #include <ctype.h>

+#include <err.h>

 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

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

 
 

-#define MAN_CONF_FILE  "/etc/man.conf"
-#define MAN_CONF_KEY   "_whatdb"
+#if !HAVE_MANPATH
+static void     manconf_file(struct manconf *, const char *);
+#endif
+static void     manpath_add(struct manpaths *, const char *, int);
+static void     manpath_parseline(struct manpaths *, char *, int);

 
 

-static void     manpath_add(struct manpaths *, const char *);
-static void     manpath_parseline(struct manpaths *, char *);

 
 void
 
 void

-manpath_parse(struct manpaths *dirs, const char *file,
+manconf_parse(struct manconf *conf, const char *file,

                char *defp, char *auxp)
 {
                char *defp, char *auxp)
 {

-#ifdef USE_MANPATH
+#if HAVE_MANPATH

        char             cmd[(PATH_MAX * 3) + 20];
        FILE            *stream;
        char            *buf;
        char             cmd[(PATH_MAX * 3) + 20];
        FILE            *stream;
        char            *buf;


@@ -79,7 +81,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
        if ( ! ferror(stream) && feof(stream) &&
                        bsz && '\n' == buf[bsz - 1]) {
                buf[bsz - 1] = '\0';
        if ( ! ferror(stream) && feof(stream) &&
                        bsz && '\n' == buf[bsz - 1]) {
                buf[bsz - 1] = '\0';

-               manpath_parseline(dirs, buf);
+               manpath_parseline(&conf->manpath, buf, 1);

        }
 
        free(buf);
        }
 
        free(buf);


@@ -88,11 +90,11 @@ manpath_parse(struct manpaths *dirs, const char *file,
        char            *insert;
 
        /* Always prepend -m. */
        char            *insert;
 
        /* Always prepend -m. */

-       manpath_parseline(dirs, auxp);
+       manpath_parseline(&conf->manpath, auxp, 1);

 
        /* If -M is given, it overrides everything else. */
        if (NULL != defp) {
 
        /* If -M is given, it overrides everything else. */
        if (NULL != defp) {

-               manpath_parseline(dirs, defp);
+               manpath_parseline(&conf->manpath, defp, 1);

                return;
        }
 
                return;
        }
 


@@ -103,21 +105,21 @@ manpath_parse(struct manpaths *dirs, const char *file,
 
        /* No MANPATH; use man.conf(5) only. */
        if (NULL == defp || '\0' == defp[0]) {
 
        /* No MANPATH; use man.conf(5) only. */
        if (NULL == defp || '\0' == defp[0]) {

-               manpath_manconf(dirs, file);
+               manconf_file(conf, file);

                return;
        }
 
        /* Prepend man.conf(5) to MANPATH. */
        if (':' == defp[0]) {
                return;
        }
 
        /* Prepend man.conf(5) to MANPATH. */
        if (':' == defp[0]) {

-               manpath_manconf(dirs, file);
-               manpath_parseline(dirs, defp);
+               manconf_file(conf, file);
+               manpath_parseline(&conf->manpath, defp, 0);

                return;
        }
 
        /* Append man.conf(5) to MANPATH. */
        if (':' == defp[strlen(defp) - 1]) {
                return;
        }
 
        /* Append man.conf(5) to MANPATH. */
        if (':' == defp[strlen(defp) - 1]) {

-               manpath_parseline(dirs, defp);
-               manpath_manconf(dirs, file);
+               manpath_parseline(&conf->manpath, defp, 0);
+               manconf_file(conf, file);

                return;
        }
 
                return;
        }
 


@@ -125,14 +127,14 @@ manpath_parse(struct manpaths *dirs, const char *file,
        insert = strstr(defp, "::");
        if (NULL != insert) {
                *insert++ = '\0';
        insert = strstr(defp, "::");
        if (NULL != insert) {
                *insert++ = '\0';

-               manpath_parseline(dirs, defp);
-               manpath_manconf(dirs, file);
-               manpath_parseline(dirs, insert + 1);
+               manpath_parseline(&conf->manpath, defp, 0);
+               manconf_file(conf, file);
+               manpath_parseline(&conf->manpath, insert + 1, 0);

                return;
        }
 
        /* MANPATH overrides man.conf(5) completely. */
                return;
        }
 
        /* MANPATH overrides man.conf(5) completely. */

-       manpath_parseline(dirs, defp);
+       manpath_parseline(&conf->manpath, defp, 0);

 #endif
 }
 
 #endif
 }
 


@@ -140,7 +142,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
  * Parse a FULL pathname from a colon-separated list of arrays.
  */
 static void
  * Parse a FULL pathname from a colon-separated list of arrays.
  */
 static void

-manpath_parseline(struct manpaths *dirs, char *path)
+manpath_parseline(struct manpaths *dirs, char *path, int complain)

 {
        char    *dir;
 
 {
        char    *dir;
 


@@ -148,7 +150,7 @@ manpath_parseline(struct manpaths *dirs, char *path)
                return;
 
        for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":"))
                return;
 
        for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":"))

-               manpath_add(dirs, dir);
+               manpath_add(dirs, dir, complain);

 }
 
 /*
 }
 
 /*


@@ -156,68 +158,171 @@ manpath_parseline(struct manpaths *dirs, char *path)
  * Grow the array one-by-one for simplicity's sake.
  */
 static void
  * Grow the array one-by-one for simplicity's sake.
  */
 static void

-manpath_add(struct manpaths *dirs, const char *dir)
+manpath_add(struct manpaths *dirs, const char *dir, int complain)

 {
        char             buf[PATH_MAX];
 {
        char             buf[PATH_MAX];

+       struct stat      sb;

        char            *cp;
        size_t           i;
 
        char            *cp;
        size_t           i;
 

-       if (NULL == (cp = realpath(dir, buf)))
+       if (NULL == (cp = realpath(dir, buf))) {
+               if (complain)
+                       warn("manpath: %s", dir);

                return;
                return;

+       }

 
        for (i = 0; i < dirs->sz; i++)
                if (0 == strcmp(dirs->paths[i], dir))
                        return;
 
 
        for (i = 0; i < dirs->sz; i++)
                if (0 == strcmp(dirs->paths[i], dir))
                        return;
 

-       dirs->paths = mandoc_realloc
-               (dirs->paths,
-                (dirs->sz + 1) * sizeof(char *));
+       if (stat(cp, &sb) == -1) {
+               if (complain)
+                       warn("manpath: %s", dir);
+               return;
+       }
+
+       dirs->paths = mandoc_reallocarray(dirs->paths,
+           dirs->sz + 1, sizeof(char *));

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

-manpath_free(struct manpaths *p)
+manconf_free(struct manconf *conf)

 {
        size_t           i;
 
 {
        size_t           i;
 

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

 
 

-       free(p->paths);
+       free(conf->manpath.paths);
+       free(conf->output.includes);
+       free(conf->output.man);
+       free(conf->output.paper);
+       free(conf->output.style);

 }
 
 }
 

-void
-manpath_manconf(struct manpaths *dirs, const char *file)
+#if !HAVE_MANPATH
+static void
+manconf_file(struct manconf *conf, const char *file)

 {
 {

-       FILE            *stream;
-       char            *p, *q;
-       size_t           len, keysz;
+       const char *const toks[] = { "manpath", "output", "_whatdb" };
+       char manpath_default[] = MANPATH_DEFAULT;

 
 

-       keysz = strlen(MAN_CONF_KEY);
-       assert(keysz > 0);
+       FILE            *stream;
+       char            *cp, *ep;
+       size_t           len, tok;

 
 

-       if (NULL == (stream = fopen(file, "r")))
-               return;
+       if ((stream = fopen(file, "r")) == NULL)
+               goto out;

 
 

-       while (NULL != (p = fgetln(stream, &len))) {
-               if (0 == len || '\n' != p[--len])
+       while ((cp = fgetln(stream, &len)) != NULL) {
+               ep = cp + len;
+               if (ep[-1] != '\n')

                        break;
                        break;

-               p[len] = '\0';
-               while (isspace((unsigned char)*p))
-                       p++;
-               if (strncmp(MAN_CONF_KEY, p, keysz))
+               *--ep = '\0';
+               while (isspace((unsigned char)*cp))
+                       cp++;
+               if (*cp == '#')

                        continue;
                        continue;

-               p += keysz;
-               while (isspace((unsigned char)*p))
-                       p++;
-               if ('\0' == *p)
-                       continue;
-               if (NULL == (q = strrchr(p, '/')))
-                       continue;
-               *q = '\0';
-               manpath_add(dirs, p);
-       }

 
 

+               for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
+                       len = strlen(toks[tok]);
+                       if (cp + len < ep &&
+                           isspace((unsigned char)cp[len]) &&
+                           !strncmp(cp, toks[tok], len)) {
+                               cp += len;
+                               while (isspace((unsigned char)*cp))
+                                       cp++;
+                               break;
+                       }
+               }
+
+               switch (tok) {
+               case 2:  /* _whatdb */
+                       while (ep > cp && ep[-1] != '/')
+                               ep--;
+                       if (ep == cp)
+                               continue;
+                       *ep = '\0';
+                       /* FALLTHROUGH */
+               case 0:  /* manpath */
+                       manpath_add(&conf->manpath, cp, 0);
+                       *manpath_default = '\0';
+                       break;
+               case 1:  /* output */
+                       manconf_output(&conf->output, cp);
+                       break;
+               default:
+                       break;
+               }
+       }

        fclose(stream);
        fclose(stream);

+
+out:
+       if (*manpath_default != '\0')
+               manpath_parseline(&conf->manpath, manpath_default, 0);
+}
+#endif
+
+void
+manconf_output(struct manoutput *conf, const char *cp)
+{
+       const char *const toks[] = {
+           "includes", "man", "paper", "style",
+           "indent", "width", "fragment", "mdoc"
+       };
+
+       size_t   len, tok;
+
+       for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
+               len = strlen(toks[tok]);
+               if ( ! strncmp(cp, toks[tok], len) &&
+                   strchr(" =  ", cp[len]) != NULL) {
+                       cp += len;
+                       if (*cp == '=')
+                               cp++;
+                       while (isspace((unsigned char)*cp))
+                               cp++;
+                       break;
+               }
+       }
+
+       if (tok < 6 && *cp == '\0')
+               return;
+
+       switch (tok) {
+       case 0:
+               if (conf->includes == NULL)
+                       conf->includes = mandoc_strdup(cp);
+               break;
+       case 1:
+               if (conf->man == NULL)
+                       conf->man = mandoc_strdup(cp);
+               break;
+       case 2:
+               if (conf->paper == NULL)
+                       conf->paper = mandoc_strdup(cp);
+               break;
+       case 3:
+               if (conf->style == NULL)
+                       conf->style = mandoc_strdup(cp);
+               break;
+       case 4:
+               if (conf->indent == 0)
+                       conf->indent = strtonum(cp, 0, 1000, NULL);
+               break;
+       case 5:
+               if (conf->width == 0)
+                       conf->width = strtonum(cp, 58, 1000, NULL);
+               break;
+       case 6:
+               conf->fragment = 1;
+               break;
+       case 7:
+               conf->mdoc = 1;
+               break;
+       default:
+               break;
+       }

 }
 }