=================================================================== RCS file: /cvs/mandoc/manpath.c,v retrieving revision 1.6 retrieving revision 1.23 diff -u -p -r1.6 -r1.23 --- mandoc/manpath.c 2011/12/13 20:56:46 1.6 +++ mandoc/manpath.c 2015/03/27 17:37:25 1.23 @@ -1,48 +1,45 @@ -/* $Id: manpath.c,v 1.6 2011/12/13 20:56:46 kristaps Exp $ */ +/* $Id: manpath.c,v 1.23 2015/03/27 17:37:25 schwarze Exp $ */ /* - * Copyright (c) 2011 Ingo Schwarze + * Copyright (c) 2011, 2014, 2015 Ingo Schwarze * Copyright (c) 2011 Kristaps Dzonsons * * 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 - * 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. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif -#include +#include +#include -#include #include #include #include #include #include -#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" +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 *); -static void manpath_parseline(struct manpaths *, char *); void -manpath_parse(struct manpaths *dirs, const char *file, +manconf_parse(struct manconf *conf, const char *file, char *defp, char *auxp) { -#ifdef USE_MANPATH - char cmd[(MAXPATHLEN * 3) + 20]; +#if HAVE_MANPATH + char cmd[(PATH_MAX * 3) + 20]; FILE *stream; char *buf; size_t sz, bsz; @@ -63,7 +60,6 @@ manpath_parse(struct manpaths *dirs, const char *file, /* Open manpath(1). Ignore errors. */ - warnx(cmd); stream = popen(cmd, "r"); if (NULL == stream) return; @@ -75,28 +71,70 @@ manpath_parse(struct manpaths *dirs, const char *file, do { buf = mandoc_realloc(buf, bsz + 1024); - sz = fread(buf + (int)bsz, 1, 1024, stream); + 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); + manpath_parseline(dirs, buf, 1); } free(buf); pclose(stream); #else - manpath_parseline(dirs, auxp); + char manpath_default[] = MANPATH_DEFAULT; + char *insert; - if (NULL == defp) - defp = getenv("MANPATH"); + /* Always prepend -m. */ + manpath_parseline(&conf->manpath, auxp, 1); - if (NULL == defp) - manpath_manconf(dirs, file ? file : MAN_CONF_FILE); - else - manpath_parseline(dirs, defp); + /* If -M is given, it overrides everything else. */ + if (NULL != defp) { + manpath_parseline(&conf->manpath, defp, 1); + 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]) { + manconf_file(conf, file); + if (conf->manpath.sz == 0) + manpath_parseline(&conf->manpath, manpath_default, 0); + return; + } + + /* Prepend man.conf(5) to MANPATH. */ + if (':' == defp[0]) { + manconf_file(conf, file); + manpath_parseline(&conf->manpath, defp, 0); + return; + } + + /* Append man.conf(5) to MANPATH. */ + if (':' == defp[strlen(defp) - 1]) { + manpath_parseline(&conf->manpath, defp, 0); + manconf_file(conf, file); + return; + } + + /* Insert man.conf(5) into MANPATH. */ + insert = strstr(defp, "::"); + if (NULL != insert) { + *insert++ = '\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. */ + manpath_parseline(&conf->manpath, defp, 0); #endif } @@ -104,7 +142,7 @@ manpath_parse(struct manpaths *dirs, const char *file, * 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; @@ -112,7 +150,7 @@ manpath_parseline(struct manpaths *dirs, char *path) return; for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":")) - manpath_add(dirs, dir); + manpath_add(dirs, dir, complain); } /* @@ -120,68 +158,168 @@ manpath_parseline(struct manpaths *dirs, char *path) * 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]; + struct stat sb; char *cp; - int i; + size_t i; - if (NULL == (cp = realpath(dir, buf))) + if (NULL == (cp = realpath(dir, buf))) { + if (complain) { + fputs("manpath: ", stderr); + perror(dir); + } return; + } for (i = 0; i < dirs->sz; i++) if (0 == strcmp(dirs->paths[i], dir)) return; - dirs->paths = mandoc_realloc - (dirs->paths, - ((size_t)dirs->sz + 1) * sizeof(char *)); + if (stat(cp, &sb) == -1) { + if (complain) { + fputs("manpath: ", stderr); + perror(dir); + } + return; + } + dirs->paths = mandoc_reallocarray(dirs->paths, + dirs->sz + 1, sizeof(char *)); + dirs->paths[dirs->sz++] = mandoc_strdup(cp); } void -manpath_free(struct manpaths *p) +manconf_free(struct manconf *conf) { - int 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" }; + FILE *stream; - char *p, *q; - size_t len, keysz; + char *cp, *ep; + size_t len, tok; - keysz = strlen(MAN_CONF_KEY); - assert(keysz > 0); - - if (NULL == (stream = fopen(file, "r"))) + if ((stream = fopen(file, "r")) == NULL) return; - 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; - 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; - p += keysz; - while (isspace(*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); + break; + case 1: /* output */ + manconf_output(&conf->output, cp); + break; + default: + break; + } } fclose(stream); +} + +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; + } }