support more than one tag entry for the same search term;

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index f5ef2cc417f5e48dc82dfa64ce37c60c9f76bf7c..008c593923793d454b2264209e4a181390431861 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*     $Id: manpath.c,v 1.21 2015/03/22 18:14:30 schwarze Exp $ */
+/*     $Id: manpath.c,v 1.31 2016/07/19 22:40:33 schwarze Exp $        */

 /*
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>


@@ -7,9 +7,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * 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
  * 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


@@ -20,81 +20,35 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 

-#include <assert.h>

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

+#if HAVE_ERR
+#include <err.h>
+#endif

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

-#include "manpath.h"
-
-#define MAN_CONF_FILE  "/etc/man.conf"
-#define MAN_CONF_KEY   "_whatdb"
+#include "manconf.h"

 
 

+static void     manconf_file(struct manconf *, const char *);

 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 *, int);
 static void     manpath_parseline(struct manpaths *, char *, int);
 

+

 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)
 {

-#if HAVE_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, 1);
-       }
-
-       free(buf);
-       pclose(stream);
-#else
-       char             manpath_default[] = MANPATH_DEFAULT;

        char            *insert;
 
        /* Always prepend -m. */
        char            *insert;
 
        /* Always prepend -m. */

-       manpath_parseline(dirs, auxp, 1);
+       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, 1);
+               manpath_parseline(&conf->manpath, defp, 1);

                return;
        }
 
                return;
        }
 


@@ -105,23 +59,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);
-               if (dirs->sz == 0)
-                       manpath_parseline(dirs, manpath_default, 0);
+               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, 0);
+               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, 0);
-               manpath_manconf(dirs, file);
+               manpath_parseline(&conf->manpath, defp, 0);
+               manconf_file(conf, file);

                return;
        }
 
                return;
        }
 


@@ -129,15 +81,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, 0);
-               manpath_manconf(dirs, file);
-               manpath_parseline(dirs, insert + 1, 0);
+               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, 0);
-#endif
+       manpath_parseline(&conf->manpath, defp, 0);

 }
 
 /*
 }
 
 /*


@@ -168,10 +119,8 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
        size_t           i;
 
        if (NULL == (cp = realpath(dir, buf))) {
        size_t           i;
 
        if (NULL == (cp = realpath(dir, buf))) {

-               if (complain) {
-                       fputs("manpath: ", stderr);
-                       perror(dir);
-               }
+               if (complain)
+                       warn("manpath: %s", dir);

                return;
        }
 
                return;
        }
 


@@ -180,10 +129,8 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
                        return;
 
        if (stat(cp, &sb) == -1) {
                        return;
 
        if (stat(cp, &sb) == -1) {

-               if (complain) {
-                       fputs("manpath: ", stderr);
-                       perror(dir);
-               }
+               if (complain)
+                       warn("manpath: %s", dir);

                return;
        }
 
                return;
        }
 


@@ -194,47 +141,144 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
 }
 
 void
 }
 
 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)
+static void
+manconf_file(struct manconf *conf, const char *file)

 {
 {

+       const char *const toks[] = { "manpath", "output", "_whatdb" };
+       char manpath_default[] = MANPATH_DEFAULT;
+

        FILE            *stream;
        FILE            *stream;

-       char            *p, *q;
-       size_t           len, keysz;
+       char            *line, *cp, *ep;
+       size_t           linesz, tok, toklen;
+       ssize_t          linelen;
+
+       if ((stream = fopen(file, "r")) == NULL)
+               goto out;
+
+       line = NULL;
+       linesz = 0;
+
+       while ((linelen = getline(&line, &linesz, stream)) != -1) {
+               cp = line;
+               ep = cp + linelen - 1;
+               while (ep > cp && isspace((unsigned char)*ep))
+                       *ep-- = '\0';
+               while (isspace((unsigned char)*cp))
+                       cp++;
+               if (cp == ep || *cp == '#')
+                       continue;

 
 

-       keysz = strlen(MAN_CONF_KEY);
-       assert(keysz > 0);
+               for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
+                       toklen = strlen(toks[tok]);
+                       if (cp + toklen < ep &&
+                           isspace((unsigned char)cp[toklen]) &&
+                           strncmp(cp, toks[tok], toklen) == 0) {
+                               cp += toklen;
+                               while (isspace((unsigned char)*cp))
+                                       cp++;
+                               break;
+                       }
+               }

 
 

-       if (NULL == (stream = fopen(file, "r")))
-               return;
+               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;
+               }
+       }
+       free(line);
+       fclose(stream);
+
+out:
+       if (*manpath_default != '\0')
+               manpath_parseline(&conf->manpath, manpath_default, 0);
+}

 
 

-       while (NULL != (p = fgetln(stream, &len))) {
-               if (0 == len || '\n' != p[--len])
+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;
                        break;

-               p[len] = '\0';
-               while (isspace((unsigned char)*p))
-                       p++;
-               if (strncmp(MAN_CONF_KEY, p, keysz))
-                       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, 0);
+               }

        }
 
        }
 

-       fclose(stream);
+       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;
+       }

 }
 }