===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.8
retrieving revision 1.37
diff -u -p -r1.8 -r1.37
--- mandoc/Attic/apropos.c	2011/11/09 01:24:23	1.8
+++ mandoc/Attic/apropos.c	2014/01/06 03:02:46	1.37
@@ -1,6 +1,7 @@
-/*	$Id: apropos.c,v 1.8 2011/11/09 01:24:23 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.37 2014/01/06 03:02:46 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
@@ -14,153 +15,106 @@
  * 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 <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "apropos.h"
-#include "mandoc.h"
+#include "manpath.h"
+#include "mansearch.h"
 
-struct	type {
-	int		 mask;
-	const char	*name; /* command-line type name */
-};
-
-static	const struct type types[] = {
-	{ TYPE_NAME, "name" },
-	{ TYPE_FUNCTION, "func" },
-	{ TYPE_UTILITY, "utility" },
-	{ TYPE_INCLUDES, "incl" },
-	{ TYPE_VARIABLE, "var" },
-	{ TYPE_STANDARD, "stand" },
-	{ TYPE_AUTHOR, "auth" },
-	{ TYPE_CONFIG, "conf" },
-	{ TYPE_DESC, "desc" },
-	{ TYPE_XREF, "xref" },
-	{ TYPE_PATH, "path" },
-	{ TYPE_ENV, "env" },
-	{ TYPE_ERR, "err" },
-	{ INT_MAX, "all" },
-	{ 0, NULL }
-};
-
-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, i;
-	char		*q, *v;
-	struct opts	 opts;
-	extern int	 optind;
+	int		 ch, whatis;
+	struct mansearch search;
+	size_t		 i, sz;
+	struct manpage	*res;
+	struct manpaths	 paths;
+	char		*defpaths, *auxpaths;
+	char		*conf_file;
+	char		*progname;
+	const char	*outkey;
 	extern char	*optarg;
+	extern int	 optind;
 
-	memset(&opts, 0, sizeof(struct opts));
-
-	q = NULL;
-
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
 		progname = argv[0];
 	else
 		++progname;
 
-	while (-1 != (ch = getopt(argc, argv, "a:c:I:t:"))) 
+	whatis = (0 == strncmp(progname, "whatis", 6));
+
+	memset(&paths, 0, sizeof(struct manpaths));
+	memset(&search, 0, sizeof(struct mansearch));
+
+	auxpaths = defpaths = NULL;
+	conf_file = NULL;
+	outkey = "Nd";
+
+	while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
 		switch (ch) {
-		case ('a'):
-			opts.arch = optarg;
+		case ('C'):
+			conf_file = optarg;
 			break;
-		case ('c'):
-			opts.cat = optarg;
+		case ('M'):
+			defpaths = optarg;
 			break;
-		case ('I'):
-			opts.flags |= OPTS_INSENS;
+		case ('m'):
+			auxpaths = optarg;
 			break;
-		case ('t'):
-			while (NULL != (v = strsep(&optarg, ","))) {
-				if ('\0' == *v)
-					continue;
-				for (i = 0; types[i].mask; i++) {
-					if (strcmp(types[i].name, v))
-						continue;
-					break;
-				}
-				if (0 == types[i].mask)
-					break;
-				opts.types |= types[i].mask;
-			}
-			if (NULL == v)
-				break;
-			
-			fprintf(stderr, "%s: Bad type\n", v);
-			return(EXIT_FAILURE);
+		case ('O'):
+			outkey = optarg;
+			break;
+		case ('S'):
+			search.arch = optarg;
+			break;
+		case ('s'):
+			search.sec = optarg;
+			break;
 		default:
-			usage();
-			return(EXIT_FAILURE);
+			goto usage;
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	if (0 == argc || '\0' == **argv) {
-		usage();
-		return(EXIT_SUCCESS);
-	} else
-		q = *argv;
+	if (0 == argc)
+		goto usage;
 
-	if (0 == opts.types)
-		opts.types = TYPE_NAME | TYPE_DESC;
+	search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+	search.flags = whatis ? MANSEARCH_WHATIS : 0;
 
-	/*
-	 * Configure databases.
-	 * The keyword database is a btree that allows for duplicate
-	 * entries.
-	 * The index database is a recno.
-	 */
+	manpath_parse(&paths, conf_file, defpaths, auxpaths);
+	ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
+	manpath_free(&paths);
 
-	apropos_search(&opts, q, NULL, list);
-	return(EXIT_SUCCESS);
-}
+	if (0 == ch)
+		goto usage;
 
-/* ARGSUSED */
-static void
-list(struct rec *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 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] "
-			"[-a arch] "
-			"[-c cat] "
-			"[-t type[,...]] "
-			"key\n", progname);
+	free(res);
+	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);
 }