diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2020-02-10 14:42:04 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2020-02-10 14:42:04 +0000 |
| commit | 1de9f99488375771f1cea0a01f23a012f2b1b1a1 (patch) | |
| tree | 76ea47e102946416d0c3d7b20f45b2f759e76a84 /usr.bin/mandoc | |
| parent | 531967f73bc32b9dc4c55e4c59c7201b398868ee (diff) | |
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 'usr.bin/mandoc')
| -rw-r--r-- | usr.bin/mandoc/man.conf.5 | 8 | ||||
| -rw-r--r-- | usr.bin/mandoc/manpath.c | 11 |
2 files changed, 3 insertions, 16 deletions
diff --git a/usr.bin/mandoc/man.conf.5 b/usr.bin/mandoc/man.conf.5 index 190d0a0bc75..2ba8cde4bcd 100644 --- a/usr.bin/mandoc/man.conf.5 +++ b/usr.bin/mandoc/man.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: man.conf.5,v 1.7 2020/02/10 13:18:21 schwarze Exp $ +.\" $OpenBSD: man.conf.5,v 1.8 2020/02/10 14:42:03 schwarze Exp $ .\" .\" Copyright (c) 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> .\" @@ -101,12 +101,6 @@ manual. .It Ic toc Ta none Ta Cm html Ta print table of contents .It Ic width Ta integer Ta Cm ascii , utf8 Ta right margin .El -.It Ic _whatdb Ar path Ns Cm /whatis.db -This directive provides the same functionality as -.Ic manpath , -but using a historic and misleading syntax. -It is kept for backward compatibility for now, -but will eventually be removed. .El .Sh FILES .Bl -tag -width /etc/examples/man.conf -compact diff --git a/usr.bin/mandoc/manpath.c b/usr.bin/mandoc/manpath.c index 2ac9d86c219..dcd12a05a49 100644 --- a/usr.bin/mandoc/manpath.c +++ b/usr.bin/mandoc/manpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: manpath.c,v 1.27 2019/07/10 19:38:56 schwarze Exp $ */ +/* $OpenBSD: manpath.c,v 1.28 2020/02/10 14:42:03 schwarze Exp $ */ /* * Copyright (c) 2011,2014,2015,2017-2019 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> @@ -165,7 +165,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; @@ -202,13 +202,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'; |