===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.16
retrieving revision 1.31
diff -u -p -r1.16 -r1.31
--- mandoc/Attic/apropos.c	2011/11/20 16:29:50	1.16
+++ mandoc/Attic/apropos.c	2012/06/08 10:44:52	1.31
@@ -1,7 +1,6 @@
-/*	$Id: apropos.c,v 1.16 2011/11/20 16:29:50 kristaps 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) 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
@@ -18,43 +17,30 @@
 #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"
 
-/*
- * List of paths to be searched for manual databases.
- */
-struct	manpaths {
-	int	  sz;
-	char	**paths;
-};
-
-static	int	 cmp(const void *, const void *);
-static	void	 list(struct res *, size_t, void *);
-static	void	 manpath_add(struct manpaths *, const char *);
-static	void	 manpath_parse(struct manpaths *, char *);
-static	void	 usage(void);
-
-static	char	*progname;
-
 int
 main(int argc, char *argv[])
 {
-	int		 i, ch, rc;
+	int		 ch;
+	size_t		 i, sz;
+	struct manpage	*res;
+	char		*conf_file, *defpaths, *auxpaths,
+			*arch, *sec;
 	struct manpaths	 paths;
-	size_t		 terms;
-	struct opts	 opts;
-	struct expr	*e;
-	extern int	 optind;
+	char		*progname;
 	extern char	*optarg;
+	extern int	 optind;
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -62,131 +48,57 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
+	auxpaths = defpaths = conf_file = arch = sec = NULL;
 	memset(&paths, 0, sizeof(struct manpaths));
-	memset(&opts, 0, sizeof(struct opts));
 
-	e = NULL;
-	rc = 0;
-
-	while (-1 != (ch = getopt(argc, argv, "m:S:s:"))) 
+	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'):
-			manpath_parse(&paths, optarg);
+			auxpaths = optarg;
 			break;
 		case ('S'):
-			opts.arch = optarg;
+			arch = optarg;
 			break;
 		case ('s'):
-			opts.cat = optarg;
+			sec = optarg;
 			break;
 		default:
-			usage();
-			goto out;
+			goto usage;
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	if (0 == argc) {
-		rc = 1;
-		goto out;
-	}
+	if (0 == argc)
+		goto usage;
 
-	/*
-	 * Let MANPATH override our default paths.
-	 */
+	manpath_parse(&paths, conf_file, defpaths, auxpaths);
+	ch = mansearch(&paths, arch, sec, argc, argv, &res, &sz);
+	manpath_free(&paths);
 
-	if (NULL != getenv("MANPATH"))
-		manpath_add(&paths, getenv("MANPATH"));
-	else
-		manpath_add(&paths, ".");
+	if (0 == ch)
+		goto usage;
 
-	if (NULL == (e = exprcomp(argc, argv, &terms))) {
-		fprintf(stderr, "%s: Bad expression\n", progname);
-		goto out;
+	for (i = 0; i < sz; i++) {
+		printf("%s - %s\n", res[i].file, res[i].desc);
+		free(res[i].desc);
 	}
 
-	rc = apropos_search
-		(paths.sz, paths.paths, 
-		 &opts, e, terms, NULL, list);
-
-	if (0 == rc) 
-		fprintf(stderr, "%s: Error reading "
-				"manual database\n", progname);
-
-out:
-	for (i = 0; i < paths.sz; i++)
-		free(paths.paths[i]);
-
-	free(paths.paths);
-	exprfree(e);
-
-	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-}
-
-/* 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)
-{
-
-	fprintf(stderr, "usage: %s "
-			"[-m dirs] "
-			"[-S arch] "
-			"[-s section] "
-			"expression...\n", progname);
-}
-
-/*
- * Parse a FULL pathname from a colon-separated list of arrays.
- */
-static void
-manpath_parse(struct manpaths *dirs, char *path) 
-{
-	char	*dir;
-
-	for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":"))
-		manpath_add(dirs, dir);
-}
-
-/*
- * Add a directory to the array, ignoring bad directories.
- * Grow the array one-by-one for simplicity's sake.
- */
-static void
-manpath_add(struct manpaths *dirs, const char *dir) 
-{
-	char		 buf[PATH_MAX];
-	char		*cp;
-
-	if (NULL == (cp = realpath(dir, buf)))
-		return;
-
-	dirs->paths = mandoc_realloc
-		(dirs->paths, 
-		 ((size_t)dirs->sz + 1) * sizeof(char *));
-
-	dirs->paths[dirs->sz++] = mandoc_strdup(cp);
+	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);
 }