===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.11
retrieving revision 1.31
diff -u -p -r1.11 -r1.31
--- mandoc/Attic/apropos.c	2011/11/13 10:12:05	1.11
+++ mandoc/Attic/apropos.c	2012/06/08 10:44:52	1.31
@@ -1,6 +1,6 @@
-/*	$Id: apropos.c,v 1.11 2011/11/13 10:12:05 schwarze Exp $ */
+/*	$Id: apropos.c,v 1.31 2012/06/08 10:44:52 kristaps Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
@@ -14,112 +14,91 @@
  * 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 <assert.h>
 #include <getopt.h>
-#include <limits.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 rec *, size_t, void *);
-static	void	 usage(void);
-
-static	char	*progname;
-
 int
 main(int argc, char *argv[])
 {
-	int		 ch, cs;
-	struct opts	 opts;
-	struct expr	*e;
-	extern int	 optind;
+	int		 ch;
+	size_t		 i, sz;
+	struct manpage	*res;
+	char		*conf_file, *defpaths, *auxpaths,
+			*arch, *sec;
+	struct manpaths	 paths;
+	char		*progname;
 	extern char	*optarg;
+	extern int	 optind;
 
-	memset(&opts, 0, sizeof(struct opts));
-
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
 		progname = argv[0];
 	else
 		++progname;
 
-	cs = 0;
+	auxpaths = defpaths = conf_file = arch = sec = NULL;
+	memset(&paths, 0, sizeof(struct manpaths));
 
-	while (-1 != (ch = getopt(argc, argv, "S:s:I"))) 
+	while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
 		switch (ch) {
+		case ('C'):
+			conf_file = optarg;
+			break;
+		case ('M'):
+			defpaths = optarg;
+			break;
+		case ('m'):
+			auxpaths = optarg;
+			break;
 		case ('S'):
-			opts.arch = optarg;
+			arch = optarg;
 			break;
 		case ('s'):
-			opts.cat = optarg;
+			sec = optarg;
 			break;
-		case ('I'):
-			cs = 1;
-			break;
 		default:
-			usage();
-			return(EXIT_FAILURE);
+			goto usage;
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	if (0 == argc) 
-		return(EXIT_SUCCESS);
+	if (0 == argc)
+		goto usage;
 
-	if (NULL == (e = exprcomp(cs, argv, argc))) {
-		fprintf(stderr, "Bad expression\n");
-		return(EXIT_FAILURE);
-	}
+	manpath_parse(&paths, conf_file, defpaths, auxpaths);
+	ch = mansearch(&paths, arch, sec, argc, argv, &res, &sz);
+	manpath_free(&paths);
 
-	/*
-	 * Configure databases.
-	 * The keyword database is a btree that allows for duplicate
-	 * entries.
-	 * The index database is a recno.
-	 */
+	if (0 == ch)
+		goto usage;
 
-	apropos_search(&opts, e, NULL, list);
-	exprfree(e);
-	return(EXIT_SUCCESS);
-}
+	for (i = 0; i < sz; i++) {
+		printf("%s - %s\n", res[i].file, res[i].desc);
+		free(res[i].desc);
+	}
 
-/* ARGSUSED */
-static void
-list(struct rec *res, size_t sz, void *arg)
-{
-	int		 i;
-
-	qsort(res, sz, sizeof(struct rec), 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 rec *)p1)->title,
-				((const struct rec *)p2)->title));
-}
-
-static void
-usage(void)
-{
-
-	fprintf(stderr, "usage: %s "
-			"[-I] "
-			"[-S arch] "
-			"[-s section] "
-			"EXPR\n", 
-			progname);
+	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);
 }