===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.13
retrieving revision 1.18
diff -u -p -r1.13 -r1.18
--- mandoc/Attic/apropos.c	2011/11/14 10:07:06	1.13
+++ mandoc/Attic/apropos.c	2011/11/23 09:50:40	1.18
@@ -1,6 +1,7 @@
-/*	$Id: apropos.c,v 1.13 2011/11/14 10:07:06 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.18 2011/11/23 09:50:40 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 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
@@ -19,17 +20,18 @@
 #endif
 
 #include <assert.h>
+#include <ctype.h>
 #include <getopt.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "apropos_db.h"
 #include "mandoc.h"
+#include "manpath.h"
 
 static	int	 cmp(const void *, const void *);
-static	void	 list(struct rec *, size_t, void *);
+static	void	 list(struct res *, size_t, void *);
 static	void	 usage(void);
 
 static	char	*progname;
@@ -37,24 +39,36 @@ static	char	*progname;
 int
 main(int argc, char *argv[])
 {
-	int		 ch;
-	size_t		 sz;
-	char		*buf;
+	int		 ch, rc;
+	struct manpaths	 paths;
+	size_t		 terms;
 	struct opts	 opts;
 	struct expr	*e;
+	char		*defpaths, *auxpaths;
 	extern int	 optind;
 	extern char	*optarg;
 
-	memset(&opts, 0, sizeof(struct opts));
-
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
 		progname = argv[0];
 	else
 		++progname;
 
-	while (-1 != (ch = getopt(argc, argv, "S:s:"))) 
+	memset(&paths, 0, sizeof(struct manpaths));
+	memset(&opts, 0, sizeof(struct opts));
+
+	auxpaths = defpaths = NULL;
+	e = NULL;
+	rc = 0;
+
+	while (-1 != (ch = getopt(argc, argv, "M:m:S:s:"))) 
 		switch (ch) {
+		case ('M'):
+			defpaths = optarg;
+			break;
+		case ('m'):
+			auxpaths = optarg;
+			break;
 		case ('S'):
 			opts.arch = optarg;
 			break;
@@ -63,60 +77,46 @@ main(int argc, char *argv[])
 			break;
 		default:
 			usage();
-			return(EXIT_FAILURE);
+			goto out;
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	if (0 == argc) 
-		return(EXIT_SUCCESS);
-
-	/* 
-	 * Collapse expressions into a single string.  
-	 * First count up the contained strings, adding a space at the
-	 * end of each (plus nil-terminator).  Then merge.
-	 */
-
-	for (sz = 0, ch = 0; ch < argc; ch++)
-		sz += strlen(argv[ch]) + 1;
-
-	buf = mandoc_malloc(++sz);
-
-	for (*buf = '\0', ch = 0; ch < argc; ch++) {
-		strlcat(buf, argv[ch], sz);
-		strlcat(buf, " ", sz);
+	if (0 == argc) {
+		rc = 1;
+		goto out;
 	}
 
-	buf[sz - 2] = '\0';
+	manpath_parse(&paths, defpaths, auxpaths);
 
-	if (NULL == (e = exprcomp(buf))) {
-		fprintf(stderr, "Bad expression\n");
-		free(buf);
-		return(EXIT_FAILURE);
+	if (NULL == (e = exprcomp(argc, argv, &terms))) {
+		fprintf(stderr, "%s: Bad expression\n", progname);
+		goto out;
 	}
 
-	free(buf);
+	rc = apropos_search
+		(paths.sz, paths.paths, 
+		 &opts, e, terms, NULL, list);
 
-	/*
-	 * Configure databases.
-	 * The keyword database is a btree that allows for duplicate
-	 * entries.
-	 * The index database is a recno.
-	 */
+	if (0 == rc) 
+		fprintf(stderr, "%s: Error reading "
+				"manual database\n", progname);
 
-	apropos_search(&opts, e, NULL, list);
+out:
+	manpath_free(&paths);
 	exprfree(e);
-	return(EXIT_SUCCESS);
+
+	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
 /* ARGSUSED */
 static void
-list(struct rec *res, size_t sz, void *arg)
+list(struct res *res, size_t sz, void *arg)
 {
 	int		 i;
 
-	qsort(res, sz, sizeof(struct rec), cmp);
+	qsort(res, sz, sizeof(struct res), cmp);
 
 	for (i = 0; i < (int)sz; i++)
 		printf("%s(%s%s%s) - %s\n", res[i].title, 
@@ -130,8 +130,8 @@ static int
 cmp(const void *p1, const void *p2)
 {
 
-	return(strcmp(((const struct rec *)p1)->title,
-				((const struct rec *)p2)->title));
+	return(strcmp(((const struct res *)p1)->title,
+				((const struct res *)p2)->title));
 }
 
 static void
@@ -139,9 +139,9 @@ usage(void)
 {
 
 	fprintf(stderr, "usage: %s "
-			"[-I] "
+			"[-M dirs] "
+			"[-m dirs] "
 			"[-S arch] "
 			"[-s section] "
-			"EXPR\n", 
-			progname);
+			"expression...\n", progname);
 }