preconv_encode() can take a const input buffer;

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index 5ff2d319ca60d9a6e9a0ff6d0dd960d0bf3b4ef0..f43ace60694ea3a6126fa4b4160d4b1b778c3ff1 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,6 +1,6 @@
-/*     $Id: manpath.c,v 1.22 2015/03/26 22:42:32 schwarze Exp $        */
+/*     $Id: manpath.c,v 1.33 2017/02/10 15:45:28 schwarze Exp $        */

 /*
 /*

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

  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -21,78 +21,34 @@
 #include <sys/stat.h>
 
 #include <ctype.h>
 #include <sys/stat.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"
+#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;
        }
 


@@ -103,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;
        }
 


@@ -127,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);

 }
 
 /*
 }
 
 /*


@@ -166,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;
        }
 


@@ -178,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;
        }
 


@@ -192,44 +141,53 @@ 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", "_whatdb" };
+       const char *const toks[] = { "manpath", "output", "_whatdb" };
+       char manpath_default[] = MANPATH_DEFAULT;

 
        FILE            *stream;
 
        FILE            *stream;

-       char            *cp, *ep;
-       size_t           len, tok;
+       char            *line, *cp, *ep;
+       size_t           linesz, tok, toklen;
+       ssize_t          linelen;

 
        if ((stream = fopen(file, "r")) == NULL)
 
        if ((stream = fopen(file, "r")) == NULL)

-               return;
+               goto out;

 
 

-       while ((cp = fgetln(stream, &len)) != NULL) {
-               ep = cp + len;
-               if (ep[-1] != '\n')
-                       break;
-               *--ep = '\0';
+       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++;
                while (isspace((unsigned char)*cp))
                        cp++;

-               if (*cp == '#')
+               if (cp == ep || *cp == '#')

                        continue;
 
                for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
                        continue;
 
                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;
+                       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;
                                while (isspace((unsigned char)*cp))
                                        cp++;
                                break;


@@ -237,7 +195,7 @@ manpath_manconf(struct manpaths *dirs, const char *file)
                }
 
                switch (tok) {
                }
 
                switch (tok) {

-               case 1:  /* _whatdb */
+               case 2:  /* _whatdb */

                        while (ep > cp && ep[-1] != '/')
                                ep--;
                        if (ep == cp)
                        while (ep > cp && ep[-1] != '/')
                                ep--;
                        if (ep == cp)


@@ -245,12 +203,124 @@ manpath_manconf(struct manpaths *dirs, const char *file)
                        *ep = '\0';
                        /* FALLTHROUGH */
                case 0:  /* manpath */
                        *ep = '\0';
                        /* FALLTHROUGH */
                case 0:  /* manpath */

-                       manpath_add(dirs, cp, 0);
+                       manpath_add(&conf->manpath, cp, 0);
+                       *manpath_default = '\0';
+                       break;
+               case 1:  /* output */
+                       manconf_output(&conf->output, cp, 1);

                        break;
                default:
                        break;
                }
        }
                        break;
                default:
                        break;
                }
        }

-
+       free(line);

        fclose(stream);
        fclose(stream);

+
+out:
+       if (*manpath_default != '\0')
+               manpath_parseline(&conf->manpath, manpath_default, 0);
+}
+
+int
+manconf_output(struct manoutput *conf, const char *cp, int fromfile)
+{
+       const char *const toks[] = {
+           "includes", "man", "paper", "style",
+           "indent", "width", "fragment", "mdoc", "noval"
+       };
+
+       const char      *errstr;
+       char            *oldval;
+       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') {
+               warnx("-O %s=?: Missing argument value", toks[tok]);
+               return -1;
+       }
+       if ((tok == 6 || tok == 7) && *cp != '\0') {
+               warnx("-O %s: Does not take a value: %s", toks[tok], cp);
+               return -1;
+       }
+
+       switch (tok) {
+       case 0:
+               if (conf->includes != NULL) {
+                       oldval = mandoc_strdup(conf->includes);
+                       break;
+               }
+               conf->includes = mandoc_strdup(cp);
+               return 0;
+       case 1:
+               if (conf->man != NULL) {
+                       oldval = mandoc_strdup(conf->man);
+                       break;
+               }
+               conf->man = mandoc_strdup(cp);
+               return 0;
+       case 2:
+               if (conf->paper != NULL) {
+                       oldval = mandoc_strdup(conf->paper);
+                       break;
+               }
+               conf->paper = mandoc_strdup(cp);
+               return 0;
+       case 3:
+               if (conf->style != NULL) {
+                       oldval = mandoc_strdup(conf->style);
+                       break;
+               }
+               conf->style = mandoc_strdup(cp);
+               return 0;
+       case 4:
+               if (conf->indent) {
+                       mandoc_asprintf(&oldval, "%zu", conf->indent);
+                       break;
+               }
+               conf->indent = strtonum(cp, 0, 1000, &errstr);
+               if (errstr == NULL)
+                       return 0;
+               warnx("-O indent=%s is %s", cp, errstr);
+               return -1;
+       case 5:
+               if (conf->width) {
+                       mandoc_asprintf(&oldval, "%zu", conf->width);
+                       break;
+               }
+               conf->width = strtonum(cp, 58, 1000, &errstr);
+               if (errstr == NULL)
+                       return 0;
+               warnx("-O width=%s is %s", cp, errstr);
+               return -1;
+       case 6:
+               conf->fragment = 1;
+               return 0;
+       case 7:
+               conf->mdoc = 1;
+               return 0;
+       case 8:
+               conf->noval = 1;
+               return 0;
+       default:
+               if (fromfile)
+                       warnx("-O %s: Bad argument", cp);
+               return -1;
+       }
+       if (fromfile == 0)
+               warnx("-O %s=%s: Option already set to %s",
+                   toks[tok], cp, oldval);
+       free(oldval);
+       return -1;

 }
 }