===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.37
retrieving revision 1.40
diff -u -p -r1.37 -r1.40
--- mandoc/Attic/apropos.c	2014/01/06 03:02:46	1.37
+++ mandoc/Attic/apropos.c	2014/08/10 23:54:41	1.40
@@ -1,4 +1,4 @@
-/*	$Id: apropos.c,v 1.37 2014/01/06 03:02:46 schwarze Exp $ */
+/*	$Id: apropos.c,v 1.40 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,10 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
 #include <sys/param.h>
+#include <sys/types.h>
 
 #include <assert.h>
 #include <getopt.h>
@@ -31,6 +31,7 @@
 #include "manpath.h"
 #include "mansearch.h"
 
+
 int
 main(int argc, char *argv[])
 {
@@ -63,22 +64,22 @@ main(int argc, char *argv[])
 
 	while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
 		switch (ch) {
-		case ('C'):
+		case 'C':
 			conf_file = optarg;
 			break;
-		case ('M'):
+		case 'M':
 			defpaths = optarg;
 			break;
-		case ('m'):
+		case 'm':
 			auxpaths = optarg;
 			break;
-		case ('O'):
+		case 'O':
 			outkey = optarg;
 			break;
-		case ('S'):
+		case 'S':
 			search.arch = optarg;
 			break;
-		case ('s'):
+		case 's':
 			search.sec = optarg;
 			break;
 		default:
@@ -95,6 +96,7 @@ main(int argc, char *argv[])
 	search.flags = whatis ? MANSEARCH_WHATIS : 0;
 
 	manpath_parse(&paths, conf_file, defpaths, auxpaths);
+	mansearch_setup(1);
 	ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
 	manpath_free(&paths);
 
@@ -110,6 +112,7 @@ main(int argc, char *argv[])
 	}
 
 	free(res);
+	mansearch_setup(0);
 	return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
 usage:
 	fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "