===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.31
retrieving revision 1.38
diff -u -p -r1.31 -r1.38
--- mandoc/Attic/apropos.c	2012/06/08 10:44:52	1.31
+++ mandoc/Attic/apropos.c	2014/04/11 15:46:52	1.38
@@ -1,6 +1,7 @@
-/*	$Id: apropos.c,v 1.31 2012/06/08 10:44:52 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.38 2014/04/11 15:46:52 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,6 +22,7 @@
 
 #include <assert.h>
 #include <getopt.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,13 +34,15 @@
 int
 main(int argc, char *argv[])
 {
-	int		 ch;
+	int		 ch, whatis;
+	struct mansearch search;
 	size_t		 i, sz;
 	struct manpage	*res;
-	char		*conf_file, *defpaths, *auxpaths,
-			*arch, *sec;
 	struct manpaths	 paths;
+	char		*defpaths, *auxpaths;
+	char		*conf_file;
 	char		*progname;
+	const char	*outkey;
 	extern char	*optarg;
 	extern int	 optind;
 
@@ -48,10 +52,16 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
-	auxpaths = defpaths = conf_file = arch = sec = NULL;
+	whatis = (0 == strncmp(progname, "whatis", 6));
+
 	memset(&paths, 0, sizeof(struct manpaths));
+	memset(&search, 0, sizeof(struct mansearch));
 
-	while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
+	auxpaths = defpaths = NULL;
+	conf_file = NULL;
+	outkey = "Nd";
+
+	while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
 		switch (ch) {
 		case ('C'):
 			conf_file = optarg;
@@ -62,11 +72,14 @@ main(int argc, char *argv[])
 		case ('m'):
 			auxpaths = optarg;
 			break;
+		case ('O'):
+			outkey = optarg;
+			break;
 		case ('S'):
-			arch = optarg;
+			search.arch = optarg;
 			break;
 		case ('s'):
-			sec = optarg;
+			search.sec = optarg;
 			break;
 		default:
 			goto usage;
@@ -78,27 +91,32 @@ main(int argc, char *argv[])
 	if (0 == argc)
 		goto usage;
 
+	search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+	search.flags = whatis ? MANSEARCH_WHATIS : 0;
+
 	manpath_parse(&paths, conf_file, defpaths, auxpaths);
-	ch = mansearch(&paths, arch, sec, argc, argv, &res, &sz);
+	mansearch_setup(1);
+	ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
 	manpath_free(&paths);
 
 	if (0 == ch)
 		goto usage;
 
 	for (i = 0; i < sz; i++) {
-		printf("%s - %s\n", res[i].file, res[i].desc);
-		free(res[i].desc);
+		printf("%s - %s\n", res[i].names,
+		    NULL == res[i].output ? "" : res[i].output);
+		free(res[i].file);
+		free(res[i].names);
+		free(res[i].output);
 	}
 
 	free(res);
+	mansearch_setup(0);
 	return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
 usage:
-	fprintf(stderr, "usage: %s [-C conf] "
-			 	  "[-M paths] "
-				  "[-m paths] "
-				  "[-S arch] "
-				  "[-s section] "
-			          "expr ...\n", 
-				  progname);
+	fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "
+			"[-O outkey] "
+			"[-S arch] [-s section]%s ...\n", progname,
+			whatis ? " name" : "\n               expression");
 	return(EXIT_FAILURE);
 }