=================================================================== RCS file: /cvs/mandoc/manpath.c,v retrieving revision 1.34 retrieving revision 1.44 diff -u -p -r1.34 -r1.44 --- mandoc/manpath.c 2017/06/13 15:06:56 1.34 +++ mandoc/manpath.c 2021/11/05 18:03:08 1.44 @@ -1,6 +1,6 @@ -/* $Id: manpath.c,v 1.34 2017/06/13 15:06:56 schwarze Exp $ */ +/* $Id: manpath.c,v 1.44 2021/11/05 18:03:08 schwarze Exp $ */ /* - * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze + * Copyright (c) 2011,2014,2015,2017-2019 Ingo Schwarze * Copyright (c) 2011 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any @@ -21,81 +21,75 @@ #include #include -#if HAVE_ERR -#include -#endif +#include #include #include #include #include #include "mandoc_aux.h" +#include "mandoc.h" #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 manconf_file(struct manconf *, const char *, int); +static void manpath_add(struct manpaths *, const char *, char); +static void manpath_parseline(struct manpaths *, char *, char); void -manconf_parse(struct manconf *conf, const char *file, - char *defp, char *auxp) +manconf_parse(struct manconf *conf, const char *file, char *pend, char *pbeg) { - char *insert; + int use_path_from_file = 1; /* Always prepend -m. */ - manpath_parseline(&conf->manpath, auxp, 1); + manpath_parseline(&conf->manpath, pbeg, 'm'); - /* If -M is given, it overrides everything else. */ - if (NULL != defp) { - manpath_parseline(&conf->manpath, defp, 1); - return; + if (pend != NULL && *pend != '\0') { + /* If -M is given, it overrides everything else. */ + manpath_parseline(&conf->manpath, pend, 'M'); + use_path_from_file = 0; + pbeg = pend = NULL; + } else if ((pbeg = getenv("MANPATH")) == NULL || *pbeg == '\0') { + /* No MANPATH; use man.conf(5) only. */ + pbeg = pend = NULL; + } else if (*pbeg == ':') { + /* Prepend man.conf(5) to MANPATH. */ + pend = pbeg + 1; + pbeg = NULL; + } else if ((pend = strstr(pbeg, "::")) != NULL) { + /* Insert man.conf(5) into MANPATH. */ + *pend = '\0'; + pend += 2; + } else if (pbeg[strlen(pbeg) - 1] == ':') { + /* Append man.conf(5) to MANPATH. */ + pend = NULL; + } else { + /* MANPATH overrides man.conf(5) completely. */ + use_path_from_file = 0; + pend = NULL; } - /* MANPATH and man.conf(5) cooperate. */ - defp = getenv("MANPATH"); - if (NULL == file) + manpath_parseline(&conf->manpath, pbeg, '\0'); + + if (file == NULL) file = MAN_CONF_FILE; + manconf_file(conf, file, use_path_from_file); - /* No MANPATH; use man.conf(5) only. */ - if (NULL == defp || '\0' == defp[0]) { - manconf_file(conf, file); - return; - } + manpath_parseline(&conf->manpath, pend, '\0'); +} - /* 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); +void +manpath_base(struct manpaths *dirs) +{ + char path_base[] = MANPATH_BASE; + manpath_parseline(dirs, path_base, '\0'); } /* * Parse a FULL pathname from a colon-separated list of arrays. */ static void -manpath_parseline(struct manpaths *dirs, char *path, int complain) +manpath_parseline(struct manpaths *dirs, char *path, char option) { char *dir; @@ -103,7 +97,7 @@ manpath_parseline(struct manpaths *dirs, char *path, i return; for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":")) - manpath_add(dirs, dir, complain); + manpath_add(dirs, dir, option); } /* @@ -111,33 +105,32 @@ manpath_parseline(struct manpaths *dirs, char *path, i * Grow the array one-by-one for simplicity's sake. */ static void -manpath_add(struct manpaths *dirs, const char *dir, int complain) +manpath_add(struct manpaths *dirs, const char *dir, char option) { char buf[PATH_MAX]; struct stat sb; char *cp; size_t i; - if (NULL == (cp = realpath(dir, buf))) { - if (complain) - warn("manpath: %s", dir); - return; - } + if ((cp = realpath(dir, buf)) == NULL) + goto fail; for (i = 0; i < dirs->sz; i++) - if (0 == strcmp(dirs->paths[i], dir)) + if (strcmp(dirs->paths[i], dir) == 0) return; - if (stat(cp, &sb) == -1) { - if (complain) - warn("manpath: %s", dir); - return; - } + if (stat(cp, &sb) == -1) + goto fail; dirs->paths = mandoc_reallocarray(dirs->paths, - dirs->sz + 1, sizeof(char *)); - + dirs->sz + 1, sizeof(*dirs->paths)); dirs->paths[dirs->sz++] = mandoc_strdup(cp); + return; + +fail: + if (option != '\0') + mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0, + "-%c %s: %s", option, dir, strerror(errno)); } void @@ -156,9 +149,9 @@ manconf_free(struct manconf *conf) } static void -manconf_file(struct manconf *conf, const char *file) +manconf_file(struct manconf *conf, const char *file, int use_path_from_file) { - const char *const toks[] = { "manpath", "output", "_whatdb" }; + const char *const toks[] = { "manpath", "output" }; char manpath_default[] = MANPATH_DEFAULT; FILE *stream; @@ -195,15 +188,9 @@ manconf_file(struct manconf *conf, const char *file) } 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); + if (use_path_from_file) + manpath_add(&conf->manpath, cp, '\0'); *manpath_default = '\0'; break; case 1: /* output */ @@ -217,25 +204,31 @@ manconf_file(struct manconf *conf, const char *file) fclose(stream); out: - if (*manpath_default != '\0') - manpath_parseline(&conf->manpath, manpath_default, 0); + if (use_path_from_file && *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" + /* Tokens requiring an argument. */ + "includes", "man", "paper", "style", "indent", "width", + "outfilename", "tagfilename", + /* Token taking an optional argument. */ + "tag", + /* Tokens not taking arguments. */ + "fragment", "mdoc", "noval", "toc" }; + const size_t ntoks = sizeof(toks) / sizeof(toks[0]); const char *errstr; char *oldval; size_t len, tok; - for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) { + for (tok = 0; tok < ntoks; tok++) { len = strlen(toks[tok]); - if ( ! strncmp(cp, toks[tok], len) && + if (strncmp(cp, toks[tok], len) == 0 && strchr(" = ", cp[len]) != NULL) { cp += len; if (*cp == '=') @@ -246,12 +239,12 @@ manconf_output(struct manoutput *conf, const char *cp, } } - if (tok < 6 && *cp == '\0') { - warnx("-O %s=?: Missing argument value", toks[tok]); + if (tok < 8 && *cp == '\0') { + mandoc_msg(MANDOCERR_BADVAL_MISS, 0, 0, "-O %s=?", toks[tok]); return -1; } - if ((tok == 6 || tok == 7) && *cp != '\0') { - warnx("-O %s: Does not take a value: %s", toks[tok], cp); + if (tok > 8 && tok < ntoks && *cp != '\0') { + mandoc_msg(MANDOCERR_BADVAL, 0, 0, "-O %s=%s", toks[tok], cp); return -1; } @@ -292,7 +285,8 @@ manconf_output(struct manoutput *conf, const char *cp, conf->indent = strtonum(cp, 0, 1000, &errstr); if (errstr == NULL) return 0; - warnx("-O indent=%s is %s", cp, errstr); + mandoc_msg(MANDOCERR_BADVAL_BAD, 0, 0, + "-O indent=%s is %s", cp, errstr); return -1; case 5: if (conf->width) { @@ -302,25 +296,57 @@ manconf_output(struct manoutput *conf, const char *cp, conf->width = strtonum(cp, 1, 1000, &errstr); if (errstr == NULL) return 0; - warnx("-O width=%s is %s", cp, errstr); + mandoc_msg(MANDOCERR_BADVAL_BAD, 0, 0, + "-O width=%s is %s", cp, errstr); return -1; case 6: - conf->fragment = 1; + if (conf->outfilename != NULL) { + oldval = mandoc_strdup(conf->outfilename); + break; + } + conf->outfilename = mandoc_strdup(cp); return 0; case 7: - conf->mdoc = 1; + if (conf->tagfilename != NULL) { + oldval = mandoc_strdup(conf->tagfilename); + break; + } + conf->tagfilename = mandoc_strdup(cp); return 0; + /* + * If the index of the following token changes, + * do not forget to adjust the range check above the switch. + */ case 8: + if (conf->tag != NULL) { + oldval = mandoc_strdup(conf->tag); + break; + } + conf->tag = mandoc_strdup(cp); + return 0; + case 9: + conf->fragment = 1; + return 0; + case 10: + conf->mdoc = 1; + return 0; + case 11: conf->noval = 1; return 0; + case 12: + conf->toc = 1; + return 0; default: - if (fromfile) - warnx("-O %s: Bad argument", cp); + mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0, "-O %s", cp); return -1; } - if (fromfile == 0) - warnx("-O %s=%s: Option already set to %s", - toks[tok], cp, oldval); - free(oldval); - return -1; + if (fromfile) { + free(oldval); + return 0; + } else { + mandoc_msg(MANDOCERR_BADVAL_DUPE, 0, 0, + "-O %s=%s: already set to %s", toks[tok], cp, oldval); + free(oldval); + return -1; + } }