===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.36
retrieving revision 1.39
diff -u -p -r1.36 -r1.39
--- mandoc/Attic/apropos.c	2013/12/31 03:41:14	1.36
+++ mandoc/Attic/apropos.c	2014/04/20 16:46:04	1.39
@@ -1,4 +1,4 @@
-/*	$Id: apropos.c,v 1.36 2013/12/31 03:41:14 schwarze Exp $ */
+/*	$Id: apropos.c,v 1.39 2014/04/20 16:46:04 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,6 +31,7 @@
 #include "manpath.h"
 #include "mansearch.h"
 
+
 int
 main(int argc, char *argv[])
 {
@@ -42,7 +43,7 @@ main(int argc, char *argv[])
 	char		*defpaths, *auxpaths;
 	char		*conf_file;
 	char		*progname;
-	char		*outkey;
+	const char	*outkey;
 	extern char	*optarg;
 	extern int	 optind;
 
@@ -59,26 +60,26 @@ main(int argc, char *argv[])
 
 	auxpaths = defpaths = NULL;
 	conf_file = NULL;
-	outkey = NULL;
+	outkey = "Nd";
 
 	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);
 
@@ -103,15 +105,14 @@ main(int argc, char *argv[])
 
 	for (i = 0; i < sz; i++) {
 		printf("%s - %s\n", res[i].names,
-		    NULL == outkey ? res[i].desc :
 		    NULL == res[i].output ? "" : res[i].output);
 		free(res[i].file);
 		free(res[i].names);
-		free(res[i].desc);
 		free(res[i].output);
 	}
 
 	free(res);
+	mansearch_setup(0);
 	return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
 usage:
 	fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "