mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-03 06:45:37 -08:00
Code

Finally delete support for the "_whatdb" configuration directive,

Browse Source 
which has a misleading syntax.  It was declared obsolete and
superseded by the "manpath" directive five years ago.
This commit is contained in:
schwarze 2020-02-10 14:42:03 +00:00
parent 8945acc287
commit 6709a8142f
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/mandoc/man.conf.5
View File

@ -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

11
usr.bin/mandoc/manpath.c
View File

@ -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';