From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (mandoc.bsd.lv [local])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id 7aeba301
	for <source@mandoc.bsd.lv>;
	Mon, 10 Feb 2020 09:42:40 -0500 (EST)
Date: Mon, 10 Feb 2020 09:42:40 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Finally delete support for the "_whatdb" configuration 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <ecf58322ea61bea9@mandoc.bsd.lv>

Log Message:
-----------
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.

Modified Files:
--------------
    mandoc:
        man.conf.5
        manpath.c

Revision Data
-------------
Index: manpath.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/manpath.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -Lmanpath.c -Lmanpath.c -u -p -r1.40 -r1.41
--- manpath.c
+++ manpath.c
@@ -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
 		}
 
 		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';
Index: man.conf.5
===================================================================
RCS file: /home/cvs/mandoc/mandoc/man.conf.5,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lman.conf.5 -Lman.conf.5 -u -p -r1.7 -r1.8
--- man.conf.5
+++ man.conf.5
@@ -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
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv