===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.18
retrieving revision 1.41
diff -u -p -r1.18 -r1.41
--- mandoc/Attic/apropos.c	2011/11/23 09:50:40	1.18
+++ mandoc/Attic/apropos.c	2014/08/16 23:04:25	1.41
@@ -1,7 +1,7 @@
-/*	$Id: apropos.c,v 1.18 2011/11/23 09:50:40 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.41 2014/08/16 23:04:25 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * 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
@@ -15,38 +15,37 @@
  * 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 <ctype.h>
 #include <getopt.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "apropos_db.h"
-#include "mandoc.h"
 #include "manpath.h"
+#include "mansearch.h"
 
-static	int	 cmp(const void *, const void *);
-static	void	 list(struct res *, size_t, void *);
-static	void	 usage(void);
 
-static	char	*progname;
-
 int
-main(int argc, char *argv[])
+apropos(int argc, char *argv[])
 {
-	int		 ch, rc;
+	int		 ch, whatis;
+	struct mansearch search;
+	size_t		 i, sz;
+	struct manpage	*res;
 	struct manpaths	 paths;
-	size_t		 terms;
-	struct opts	 opts;
-	struct expr	*e;
 	char		*defpaths, *auxpaths;
-	extern int	 optind;
+	char		*conf_file;
+	char		*progname;
+	const char	*outkey;
 	extern char	*optarg;
+	extern int	 optind;
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -54,94 +53,71 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
+	whatis = (0 == strncmp(progname, "whatis", 6));
+
 	memset(&paths, 0, sizeof(struct manpaths));
-	memset(&opts, 0, sizeof(struct opts));
+	memset(&search, 0, sizeof(struct mansearch));
 
 	auxpaths = defpaths = NULL;
-	e = NULL;
-	rc = 0;
+	conf_file = NULL;
+	outkey = "Nd";
 
-	while (-1 != (ch = getopt(argc, argv, "M:m:S:s:"))) 
+	while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
 		switch (ch) {
-		case ('M'):
+		case 'C':
+			conf_file = optarg;
+			break;
+		case 'M':
 			defpaths = optarg;
 			break;
-		case ('m'):
+		case 'm':
 			auxpaths = optarg;
 			break;
-		case ('S'):
-			opts.arch = optarg;
+		case 'O':
+			outkey = optarg;
 			break;
-		case ('s'):
-			opts.cat = optarg;
+		case 'S':
+			search.arch = optarg;
 			break;
+		case 's':
+			search.sec = optarg;
+			break;
 		default:
-			usage();
-			goto out;
+			goto usage;
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	if (0 == argc) {
-		rc = 1;
-		goto out;
-	}
+	if (0 == argc)
+		goto usage;
 
-	manpath_parse(&paths, defpaths, auxpaths);
+	search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+	search.flags = whatis ? MANSEARCH_WHATIS : 0;
 
-	if (NULL == (e = exprcomp(argc, argv, &terms))) {
-		fprintf(stderr, "%s: Bad expression\n", progname);
-		goto out;
-	}
-
-	rc = apropos_search
-		(paths.sz, paths.paths, 
-		 &opts, e, terms, NULL, list);
-
-	if (0 == rc) 
-		fprintf(stderr, "%s: Error reading "
-				"manual database\n", progname);
-
-out:
+	manpath_parse(&paths, conf_file, defpaths, auxpaths);
+	mansearch_setup(1);
+	ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
 	manpath_free(&paths);
-	exprfree(e);
 
-	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-}
+	if (0 == ch)
+		goto usage;
 
-/* ARGSUSED */
-static void
-list(struct res *res, size_t sz, void *arg)
-{
-	int		 i;
+	for (i = 0; i < sz; i++) {
+		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);
+	}
 
-	qsort(res, sz, sizeof(struct res), cmp);
-
-	for (i = 0; i < (int)sz; i++)
-		printf("%s(%s%s%s) - %s\n", res[i].title, 
-				res[i].cat, 
-				*res[i].arch ? "/" : "",
-				*res[i].arch ? res[i].arch : "",
-				res[i].desc);
-}
-
-static int
-cmp(const void *p1, const void *p2)
-{
-
-	return(strcmp(((const struct res *)p1)->title,
-				((const struct res *)p2)->title));
-}
-
-static void
-usage(void)
-{
-
-	fprintf(stderr, "usage: %s "
-			"[-M dirs] "
-			"[-m dirs] "
-			"[-S arch] "
-			"[-s section] "
-			"expression...\n", progname);
+	free(res);
+	mansearch_setup(0);
+	return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
+usage:
+	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);
 }