===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.27.2.1
retrieving revision 1.32
diff -u -p -r1.27.2.1 -r1.32
--- mandoc/Attic/apropos.c	2013/09/17 23:23:10	1.27.2.1
+++ mandoc/Attic/apropos.c	2012/06/09 14:11:15	1.32
@@ -1,7 +1,6 @@
-/*	$Id: apropos.c,v 1.27.2.1 2013/09/17 23:23:10 schwarze Exp $ */
+/*	$Id: apropos.c,v 1.32 2012/06/09 14:11:15 kristaps Exp $ */
 /*
- * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012 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
@@ -25,27 +24,21 @@
 #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	char	*progname;
-
 int
 main(int argc, char *argv[])
 {
-	int		 ch, rc, whatis;
-	struct res	*res;
+	int		 ch, whatis;
+	struct mansearch search;
+	size_t		 i, sz;
+	struct manpage	*res;
+	char		*conf_file, *defpaths, *auxpaths;
 	struct manpaths	 paths;
-	size_t		 terms, ressz;
-	struct opts	 opts;
-	struct expr	*e;
-	char		*defpaths, *auxpaths;
-	char		*conf_file;
+	char		*progname;
 	extern char	*optarg;
 	extern int	 optind;
 
@@ -55,17 +48,11 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
-	whatis = (0 == strncmp(progname, "whatis", 6));
-
+	auxpaths = defpaths = conf_file = NULL;
 	memset(&paths, 0, sizeof(struct manpaths));
-	memset(&opts, 0, sizeof(struct opts));
+	memset(&search, 0, sizeof(struct mansearch));
+	whatis = (0 == strcmp(progname, "whatis"));
 
-	ressz = 0;
-	res = NULL;
-	auxpaths = defpaths = NULL;
-	conf_file = NULL;
-	e = NULL;
-
 	while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
 		switch (ch) {
 		case ('C'):
@@ -78,10 +65,10 @@ main(int argc, char *argv[])
 			auxpaths = optarg;
 			break;
 		case ('S'):
-			opts.arch = optarg;
+			search.arch = optarg;
 			break;
 		case ('s'):
-			opts.cat = optarg;
+			search.sec = optarg;
 			break;
 		default:
 			goto usage;
@@ -93,64 +80,30 @@ main(int argc, char *argv[])
 	if (0 == argc)
 		goto usage;
 
-	rc = 0;
+	search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+	search.flags = whatis ? MANSEARCH_WHATIS : 0;
 
 	manpath_parse(&paths, conf_file, defpaths, auxpaths);
-
-	e = whatis ? termcomp(argc, argv, &terms) :
-		     exprcomp(argc, argv, &terms);
-		
-	if (NULL == e) {
-		fprintf(stderr, "%s: Bad expression\n", progname);
-		goto out;
-	}
-
-	rc = apropos_search
-		(paths.sz, paths.paths, &opts, 
-		 e, terms, NULL, &ressz, &res, list);
-
-	if (0 == rc) {
-		fprintf(stderr, "%s: Bad database\n", progname);
-		goto out;
-	}
-
-out:
+	ch = mansearch(&search, &paths, argc, argv, &res, &sz);
 	manpath_free(&paths);
-	resfree(res, ressz);
-	exprfree(e);
-	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
 
-usage:
-	fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "
-			"[-S arch] [-s section]%s ...\n", progname,
-			whatis ? " name" : "\n               expression");
-	return(EXIT_FAILURE);
-}
+	if (0 == ch)
+		goto usage;
 
-/* ARGSUSED */
-static void
-list(struct res *res, size_t sz, void *arg)
-{
-	size_t		 i;
-
-	qsort(res, sz, sizeof(struct res), cmp);
-
 	for (i = 0; i < sz; i++) {
-		if ( ! res[i].matched)
-			continue;
-		printf("%s(%s%s%s) - %.70s\n",
-				res[i].title,
-				res[i].cat,
-				*res[i].arch ? "/" : "",
-				*res[i].arch ? res[i].arch : "",
-				res[i].desc);
+		printf("%s - %s\n", res[i].file, res[i].desc);
+		free(res[i].desc);
 	}
-}
 
-static int
-cmp(const void *p1, const void *p2)
-{
-
-	return(strcasecmp(((const struct res *)p1)->title,
-				((const struct res *)p2)->title));
+	free(res);
+	return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
+usage:
+	fprintf(stderr, "usage: %s [-C conf] "
+			 	  "[-M paths] "
+				  "[-m paths] "
+				  "[-S arch] "
+				  "[-s section] "
+			          "expr ...\n", 
+				  progname);
+	return(EXIT_FAILURE);
 }