aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/manpath.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2020-02-10 14:42:10 +0000
committerIngo Schwarze <schwarze@openbsd.org>2020-02-10 14:42:10 +0000
commitba42c824f753d0bcddc235aab129aae58ec41d1a (patch)
treee88141adf2aac1f02ebd3f5dbe94098a61dff3c4 /manpath.c
parentbbdefdc898e672cfcc0f38f11b24eaa03e4561f7 (diff)
downloadmandoc-ba42c824f753d0bcddc235aab129aae58ec41d1a.tar.gz
mandoc-ba42c824f753d0bcddc235aab129aae58ec41d1a.tar.zst
mandoc-ba42c824f753d0bcddc235aab129aae58ec41d1a.zip
Finally delete support for the "_whatdb" configuration directive,
which has a misleading syntax. It was declared obsolete and superseded by the "manpath" directive five years ago.
Diffstat (limited to 'manpath.c')
-rw-r--r--manpath.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/manpath.c b/manpath.c
index e4578cce..49c650cc 100644
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/* $Id: manpath.c,v 1.40 2019/07/10 19:39:01 schwarze Exp $ */
+/* $Id: manpath.c,v 1.41 2020/02/10 14:42:10 schwarze Exp $ */
/*
* Copyright (c) 2011,2014,2015,2017-2019 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -163,7 +163,7 @@ manconf_free(struct manconf *conf)
static void
manconf_file(struct manconf *conf, const char *file)
{
- const char *const toks[] = { "manpath", "output", "_whatdb" };
+ const char *const toks[] = { "manpath", "output" };
char manpath_default[] = MANPATH_DEFAULT;
FILE *stream;
@@ -200,13 +200,6 @@ 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');
*manpath_default = '\0';