Parse the new man.conf(5) "output" directive.

The next step will be to actually use the parsed data.

8 files changed, 193 insertions, 103 deletions

diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index a47a62994b1..91f1e301a25 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.94 2015/03/26 23:45:37 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.95 2015/03/27 17:36:56 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -51,7 +51,7 @@ HTML_OBJS =	html.o mdoc_html.o man_html.o tbl_html.o eqn_html.o out.o
 CGI_OBJS =	${LIBMANDOC_OBJS} ${HTML_OBJS} \
 		mansearch.o mansearch_const.o cgi.o
 
-cgi.o: main.h mandoc.h mandoc_aux.h manpath.h mansearch.h cgi.h
+cgi.o: main.h mandoc.h mandoc_aux.h manconf.h mansearch.h cgi.h
 
 man.cgi: ${CGI_OBJS}
 	${CC} ${LDFLAGS} ${STATIC} -o ${.TARGET} ${CGI_OBJS} ${LDADD}
diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index c18227ffdb9..6ffc618dbbd 100644
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgi.c,v 1.43 2015/02/10 08:05:07 schwarze Exp $ */
+/*	$OpenBSD: cgi.c,v 1.44 2015/03/27 17:36:56 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -7,9 +7,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -31,7 +31,7 @@
 #include "mandoc.h"
 #include "mandoc_aux.h"
 #include "main.h"
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 #include "cgi.h"
 
diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c
index 46e77056c27..0cf4350fa28 100644
--- a/usr.bin/mandoc/main.c
+++ b/usr.bin/mandoc/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.133 2015/03/27 16:35:57 schwarze Exp $ */
+/*	$OpenBSD: main.c,v 1.134 2015/03/27 17:36:56 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -8,9 +8,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -38,7 +38,7 @@
 #include "main.h"
 #include "mdoc.h"
 #include "man.h"
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 
 enum	outmode {
@@ -109,9 +109,9 @@ static	enum mandoclevel  rc;
 int
 main(int argc, char *argv[])
 {
+	struct manconf	 conf;
 	struct curparse	 curp;
 	struct mansearch search;
-	struct manpaths	 paths;
 	char		*auxpaths;
 	char		*defos;
 	unsigned char	*uc;
@@ -141,7 +141,7 @@ main(int argc, char *argv[])
 
 	/* Search options. */
 
-	memset(&paths, 0, sizeof(struct manpaths));
+	memset(&conf, 0, sizeof(conf));
 	conf_file = defpaths = NULL;
 	auxpaths = NULL;
 
@@ -324,13 +324,15 @@ main(int argc, char *argv[])
 
 		/* Access the mandoc database. */
 
-		manpath_parse(&paths, conf_file, defpaths, auxpaths);
+		manconf_parse(&conf, conf_file, defpaths, auxpaths);
 		mansearch_setup(1);
-		if( ! mansearch(&search, &paths, argc, argv, &res, &sz))
+		if ( ! mansearch(&search, &conf.manpath,
+		    argc, argv, &res, &sz))
 			usage(search.argmode);
 
 		if (sz == 0 && search.argmode == ARG_NAME)
-			fs_search(&search, &paths, argc, argv, &res, &sz);
+			fs_search(&search, &conf.manpath,
+			    argc, argv, &res, &sz);
 
 		if (sz == 0) {
 			rc = MANDOCLEVEL_BADARG;
@@ -418,7 +420,7 @@ main(int argc, char *argv[])
 				parse(&curp, fd, *argv);
 			else if (resp->form & FORM_SRC) {
 				/* For .so only; ignore failure. */
-				chdir(paths.paths[resp->ipath]);
+				chdir(conf.manpath.paths[resp->ipath]);
 				parse(&curp, fd, resp->file);
 			} else
 				passthrough(resp->file, fd, synopsis_only);
@@ -449,7 +451,7 @@ main(int argc, char *argv[])
 
 out:
 	if (search.argmode != ARG_FILE) {
-		manpath_free(&paths);
+		manconf_free(&conf);
 		mansearch_free(res, sz);
 		mansearch_setup(0);
 	}
diff --git a/usr.bin/mandoc/manconf.h b/usr.bin/mandoc/manconf.h
new file mode 100644
index 00000000000..be60892eebc
--- /dev/null
+++ b/usr.bin/mandoc/manconf.h
@@ -0,0 +1,51 @@
+/*	$OpenBSD: manconf.h,v 1.1 2015/03/27 17:36:56 schwarze Exp $	*/
+/*
+ * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* List of unique, absolute paths to manual trees. */
+
+struct	manpaths {
+	char	**paths;
+	size_t	  sz;
+};
+
+/* Data from -O options and man.conf(5) output directives. */
+
+struct	manoutput {
+	char	 *includes;
+	char	 *man;
+	char	 *paper;
+	char	 *style;
+	size_t	  indent;
+	size_t	  width;
+	int	  fragment;
+	int	  mdoc;
+	int	  synopsisonly;
+};
+
+struct	manconf {
+	struct manoutput	  output;
+	struct manpaths		  manpath;
+};
+
+__BEGIN_DECLS
+
+void	 manconf_parse(struct manconf *, const char *, char *, char *);
+void	 manconf_output(struct manoutput *, const char *);
+void	 manconf_free(struct manconf *);
+
+__END_DECLS
diff --git a/usr.bin/mandoc/mandocdb.c b/usr.bin/mandoc/mandocdb.c
index bb9b418c65a..bd0cc2e4fca 100644
--- a/usr.bin/mandoc/mandocdb.c
+++ b/usr.bin/mandoc/mandocdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mandocdb.c,v 1.139 2015/03/13 00:18:45 schwarze Exp $ */
+/*	$OpenBSD: mandocdb.c,v 1.140 2015/03/27 17:36:56 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -7,9 +7,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -40,7 +40,7 @@
 #include "man.h"
 #include "mandoc.h"
 #include "mandoc_aux.h"
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 
 extern int mansearch_keymax;
@@ -328,15 +328,15 @@ static	const struct mdoc_handler mdocs[MDOC_MAX] = {
 int
 mandocdb(int argc, char *argv[])
 {
-	int		  ch, i;
-	size_t		  j, sz;
-	const char	 *path_arg;
-	struct manpaths	  dirs;
-	struct mparse	 *mp;
+	struct manconf	  conf;
 	struct ohash_info mpages_info, mlinks_info;
+	struct mparse	 *mp;
+	const char	 *path_arg;
+	size_t		  j, sz;
+	int		  ch, i;
 
+	memset(&conf, 0, sizeof(conf));
 	memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *));
-	memset(&dirs, 0, sizeof(struct manpaths));
 
 	mpages_info.alloc  = mlinks_info.alloc  = hash_alloc;
 	mpages_info.calloc = mlinks_info.calloc = hash_calloc;
@@ -475,18 +475,18 @@ mandocdb(int argc, char *argv[])
 		/*
 		 * If we have arguments, use them as our manpaths.
 		 * If we don't, grok from manpath(1) or however else
-		 * manpath_parse() wants to do it.
+		 * manconf_parse() wants to do it.
 		 */
 		if (argc > 0) {
-			dirs.paths = mandoc_reallocarray(NULL,
+			conf.manpath.paths = mandoc_reallocarray(NULL,
 			    argc, sizeof(char *));
-			dirs.sz = (size_t)argc;
+			conf.manpath.sz = (size_t)argc;
 			for (i = 0; i < argc; i++)
-				dirs.paths[i] = mandoc_strdup(argv[i]);
+				conf.manpath.paths[i] = mandoc_strdup(argv[i]);
 		} else
-			manpath_parse(&dirs, path_arg, NULL, NULL);
+			manconf_parse(&conf, path_arg, NULL, NULL);
 
-		if (0 == dirs.sz) {
+		if (conf.manpath.sz == 0) {
 			exitcode = (int)MANDOCLEVEL_BADARG;
 			say("", "Empty manpath");
 		}
@@ -497,10 +497,10 @@ mandocdb(int argc, char *argv[])
 		 * Ignore zero-length directories and strip trailing
 		 * slashes.
 		 */
-		for (j = 0; j < dirs.sz; j++) {
-			sz = strlen(dirs.paths[j]);
-			if (sz && '/' == dirs.paths[j][sz - 1])
-				dirs.paths[j][--sz] = '\0';
+		for (j = 0; j < conf.manpath.sz; j++) {
+			sz = strlen(conf.manpath.paths[j]);
+			if (sz && conf.manpath.paths[j][sz - 1] == '/')
+				conf.manpath.paths[j][--sz] = '\0';
 			if (0 == sz)
 				continue;
 
@@ -509,7 +509,7 @@ mandocdb(int argc, char *argv[])
 				ohash_init(&mlinks, 6, &mlinks_info);
 			}
 
-			if (0 == set_basedir(dirs.paths[j], argc > 0))
+			if ( ! set_basedir(conf.manpath.paths[j], argc > 0))
 				continue;
 			if (0 == treescan())
 				continue;
@@ -522,7 +522,7 @@ mandocdb(int argc, char *argv[])
 				names_check();
 			dbclose(0);
 
-			if (j + 1 < dirs.sz) {
+			if (j + 1 < conf.manpath.sz) {
 				mpages_free();
 				ohash_delete(&mpages);
 				ohash_delete(&mlinks);
@@ -530,7 +530,7 @@ mandocdb(int argc, char *argv[])
 		}
 	}
 out:
-	manpath_free(&dirs);
+	manconf_free(&conf);
 	mparse_free(mp);
 	mchars_free(mchars);
 	mpages_free();
diff --git a/usr.bin/mandoc/manpath.c b/usr.bin/mandoc/manpath.c
index 3db1cc8f4f3..4a11effb5ca 100644
--- a/usr.bin/mandoc/manpath.c
+++ b/usr.bin/mandoc/manpath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: manpath.c,v 1.13 2015/03/26 22:42:01 schwarze Exp $	*/
+/*	$OpenBSD: manpath.c,v 1.14 2015/03/27 17:36:56 schwarze Exp $	*/
 /*
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -25,27 +25,29 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
-#include "manpath.h"
+#include "manconf.h"
 
 #define MAN_CONF_FILE	"/etc/man.conf"
 #define MANPATH_DEFAULT	"/usr/share/man:/usr/X11R6/man:/usr/local/man"
 
+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);
 
+
 void
-manpath_parse(struct manpaths *dirs, const char *file,
+manconf_parse(struct manconf *conf, const char *file,
 		char *defp, char *auxp)
 {
 	char		 manpath_default[] = MANPATH_DEFAULT;
 	char		*insert;
 
 	/* Always prepend -m. */
-	manpath_parseline(dirs, auxp, 1);
+	manpath_parseline(&conf->manpath, auxp, 1);
 
 	/* If -M is given, it overrides everything else. */
 	if (NULL != defp) {
-		manpath_parseline(dirs, defp, 1);
+		manpath_parseline(&conf->manpath, defp, 1);
 		return;
 	}
 
@@ -56,23 +58,23 @@ manpath_parse(struct manpaths *dirs, const char *file,
 
 	/* No MANPATH; use man.conf(5) only. */
 	if (NULL == defp || '\0' == defp[0]) {
-		manpath_manconf(dirs, file);
-		if (dirs->sz == 0)
-			manpath_parseline(dirs, manpath_default, 0);
+		manconf_file(conf, file);
+		if (conf->manpath.sz == 0)
+			manpath_parseline(&conf->manpath, manpath_default, 0);
 		return;
 	}
 
 	/* Prepend man.conf(5) to MANPATH. */
 	if (':' == defp[0]) {
-		manpath_manconf(dirs, file);
-		manpath_parseline(dirs, 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(dirs, defp, 0);
-		manpath_manconf(dirs, file);
+		manpath_parseline(&conf->manpath, defp, 0);
+		manconf_file(conf, file);
 		return;
 	}
 
@@ -80,14 +82,14 @@ manpath_parse(struct manpaths *dirs, const char *file,
 	insert = strstr(defp, "::");
 	if (NULL != insert) {
 		*insert++ = '\0';
-		manpath_parseline(dirs, defp, 0);
-		manpath_manconf(dirs, file);
-		manpath_parseline(dirs, insert + 1, 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(dirs, defp, 0);
+	manpath_parseline(&conf->manpath, defp, 0);
 }
 
 /*
@@ -144,20 +146,24 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
 }
 
 void
-manpath_free(struct manpaths *p)
+manconf_free(struct manconf *conf)
 {
 	size_t		 i;
 
-	for (i = 0; i < p->sz; i++)
-		free(p->paths[i]);
+	for (i = 0; i < conf->manpath.sz; i++)
+		free(conf->manpath.paths[i]);
 
-	free(p->paths);
+	free(conf->manpath.paths);
+	free(conf->output.includes);
+	free(conf->output.man);
+	free(conf->output.paper);
+	free(conf->output.style);
 }
 
-void
-manpath_manconf(struct manpaths *dirs, const char *file)
+static void
+manconf_file(struct manconf *conf, const char *file)
 {
-	const char *const toks[] = { "manpath", "_whatdb" };
+	const char *const toks[] = { "manpath", "output", "_whatdb" };
 
 	FILE		*stream;
 	char		*cp, *ep;
@@ -189,7 +195,7 @@ manpath_manconf(struct manpaths *dirs, const char *file)
 		}
 
 		switch (tok) {
-		case 1:  /* _whatdb */
+		case 2:  /* _whatdb */
 			while (ep > cp && ep[-1] != '/')
 				ep--;
 			if (ep == cp)
@@ -197,7 +203,10 @@ manpath_manconf(struct manpaths *dirs, const char *file)
 			*ep = '\0';
 			/* FALLTHROUGH */
 		case 0:  /* manpath */
-			manpath_add(dirs, cp, 0);
+			manpath_add(&conf->manpath, cp, 0);
+			break;
+		case 1:  /* output */
+			manconf_output(&conf->output, cp);
 			break;
 		default:
 			break;
@@ -206,3 +215,65 @@ manpath_manconf(struct manpaths *dirs, const char *file)
 
 	fclose(stream);
 }
+
+void
+manconf_output(struct manoutput *conf, const char *cp)
+{
+	const char *const toks[] = {
+	    "includes", "man", "paper", "style",
+	    "indent", "width", "fragment", "mdoc"
+	};
+
+	size_t	 len, tok;
+
+	for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
+		len = strlen(toks[tok]);
+		if ( ! strncmp(cp, toks[tok], len) &&
+		    strchr(" =	", cp[len]) != NULL) {
+			cp += len;
+			if (*cp == '=')
+				cp++;
+			while (isspace((unsigned char)*cp))
+				cp++;
+			break;
+		}
+	}
+
+	if (tok < 6 && *cp == '\0')
+		return;
+
+	switch (tok) {
+	case 0:
+		if (conf->includes == NULL)
+			conf->includes = mandoc_strdup(cp);
+		break;
+	case 1:
+		if (conf->man == NULL)
+			conf->man = mandoc_strdup(cp);
+		break;
+	case 2:
+		if (conf->paper == NULL)
+			conf->paper = mandoc_strdup(cp);
+		break;
+	case 3:
+		if (conf->style == NULL)
+			conf->style = mandoc_strdup(cp);
+		break;
+	case 4:
+		if (conf->indent == 0)
+			conf->indent = strtonum(cp, 0, 1000, NULL);
+		break;
+	case 5:
+		if (conf->width == 0)
+			conf->width = strtonum(cp, 58, 1000, NULL);
+		break;
+	case 6:
+		conf->fragment = 1;
+		break;
+	case 7:
+		conf->mdoc = 1;
+		break;
+	default:
+		break;
+	}
+}
diff --git a/usr.bin/mandoc/manpath.h b/usr.bin/mandoc/manpath.h
deleted file mode 100644
index f1623c08a80..00000000000
--- a/usr.bin/mandoc/manpath.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*	$OpenBSD: manpath.h,v 1.6 2014/11/28 19:25:03 schwarze Exp $ */
-/*
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Unsorted list of unique, absolute paths to be searched for manual
- * databases.
- */
-struct	manpaths {
-	size_t	  sz;
-	char	**paths;
-};
-
-__BEGIN_DECLS
-
-void	 manpath_manconf(struct manpaths *, const char *);
-void	 manpath_parse(struct manpaths *, const char *, char *, char *);
-void	 manpath_free(struct manpaths *);
-
-__END_DECLS
diff --git a/usr.bin/mandoc/mansearch.c b/usr.bin/mandoc/mansearch.c
index 0c79dae0c00..ded79393cb5 100644
--- a/usr.bin/mandoc/mansearch.c
+++ b/usr.bin/mandoc/mansearch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mansearch.c,v 1.42 2015/03/11 13:10:25 schwarze Exp $ */
+/*	$OpenBSD: mansearch.c,v 1.43 2015/03/27 17:36:56 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -7,9 +7,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -38,7 +38,7 @@
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 
 extern int mansearch_keymax;