X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/e93722b2d89ae28d2016eb6021d60b235c94e276..f5916232841f68e5d069fb2218e04f5f8c5a2c9e:/apropos.c

diff --git a/apropos.c b/apropos.c
index 8268b035..ac56a961 100644
--- a/apropos.c
+++ b/apropos.c
@@ -1,6 +1,6 @@
-/*	$Id: apropos.c,v 1.14 2011/11/18 07:02:19 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.33 2012/06/09 17:49:13 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
@@ -17,34 +17,31 @@
 #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_db.h"
-#include "mandoc.h"
-
-static	int	 cmp(const void *, const void *);
-static	void	 list(struct res *, size_t, void *);
-static	void	 usage(void);
-
-static	char	*progname;
+#include "manpath.h"
+#include "mansearch.h"
 
 int
 main(int argc, char *argv[])
 {
-	int		 ch;
-	size_t		 terms;
-	struct opts	 opts;
-	struct expr	*e;
-	extern int	 optind;
+	int		 ch, whatis;
+	struct mansearch search;
+	size_t		 i, sz;
+	struct manpage	*res;
+	char		*conf_file, *defpaths, *auxpaths;
+	struct manpaths	 paths;
+	char		*progname;
 	extern char	*optarg;
-
-	memset(&opts, 0, sizeof(struct opts));
+	extern int	 optind;
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -52,72 +49,62 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
-	while (-1 != (ch = getopt(argc, argv, "S:s:"))) 
+	auxpaths = defpaths = conf_file = NULL;
+	memset(&paths, 0, sizeof(struct manpaths));
+	memset(&search, 0, sizeof(struct mansearch));
+	whatis = (0 == strcmp(progname, "whatis"));
+
+	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;
+			search.arch = optarg;
 			break;
 		case ('s'):
-			opts.cat = optarg;
+			search.sec = optarg;
 			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(argc, argv, &terms))) {
-		fprintf(stderr, "Bad expression\n");
-		return(EXIT_FAILURE);
-	}
+	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, &res, &sz);
+	manpath_free(&paths);
 
-	ch = apropos_search(&opts, e, terms, NULL, list);
-	exprfree(e);
 	if (0 == ch)
-		fprintf(stderr, "%s: Database error\n", progname);
-	return(ch ? EXIT_SUCCESS : EXIT_FAILURE);
-}
+		goto usage;
 
-/* ARGSUSED */
-static void
-list(struct res *res, size_t sz, void *arg)
-{
-	int		 i;
-
-	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)
-{
+	for (i = 0; i < sz; i++) {
+		printf("%s - %s\n", res[i].file, res[i].desc);
+		free(res[i].desc);
+	}
 
-	fprintf(stderr, "usage: %s [-S arch] [-s section] "
-			"expression...\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);
 }