===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.15
retrieving revision 1.34
diff -u -p -r1.15 -r1.34
--- mandoc/Attic/apropos.c	2011/11/20 15:43:14	1.15
+++ mandoc/Attic/apropos.c	2013/07/05 09:33:02	1.34
@@ -1,7 +1,6 @@
-/*	$Id: apropos.c,v 1.15 2011/11/20 15:43:14 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.34 2013/07/05 09:33:02 schwarze 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,32 @@
 #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"
+#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	int	 manpath_add(struct manpaths *, const char *);
-static	int	 manpath_parse(struct manpaths *, char *);
-static	void	 usage(void);
-
-static	char	*progname;
-
 int
 main(int argc, char *argv[])
 {
-	int		 i, ch, rc;
+	int		 ch, whatis;
+	struct mansearch search;
+	size_t		 i, sz;
+	struct manpage	*res;
 	struct manpaths	 paths;
-	size_t		 terms;
-	struct opts	 opts;
-	struct expr	*e;
-	extern int	 optind;
+	char		*defpaths, *auxpaths;
+	char		*conf_file;
+	char		*progname;
 	extern char	*optarg;
+	extern int	 optind;
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -62,132 +50,61 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
+	whatis = (0 == strncmp(progname, "whatis", 6));
+
 	memset(&paths, 0, sizeof(struct manpaths));
-	memset(&opts, 0, sizeof(struct opts));
+	memset(&search, 0, sizeof(struct mansearch));
 
-	e = NULL;
-	rc = 0;
+	auxpaths = defpaths = NULL;
+	conf_file = NULL;
 
-	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'):
-			if ( ! manpath_parse(&paths, optarg))
-				goto out;
+			auxpaths = optarg;
 			break;
 		case ('S'):
-			opts.arch = optarg;
+			search.arch = optarg;
 			break;
 		case ('s'):
-			opts.cat = optarg;
+			search.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;
 
-	if (0 == paths.sz && ! manpath_add(&paths, "."))
-		goto out;
+	search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
+	search.flags = whatis ? MANSEARCH_WHATIS : 0;
 
-	if (NULL == (e = exprcomp(argc, argv, &terms))) {
-		/* FIXME: be more specific about this. */
-		fprintf(stderr, "Bad expression\n");
-		goto out;
-	}
+	manpath_parse(&paths, conf_file, defpaths, auxpaths);
+	ch = mansearch(&search, &paths, argc, argv, &res, &sz);
+	manpath_free(&paths);
 
-	rc = apropos_search
-		(paths.sz, paths.paths, 
-		 &opts, e, terms, NULL, list);
+	if (0 == ch)
+		goto usage;
 
-	/* FIXME: report an error based on ch. */
-
-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 int
-manpath_parse(struct manpaths *dirs, char *path) 
-{
-	char	*dir;
-
-	for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":"))
-		if ( ! manpath_add(dirs, dir))
-			return(0);
-
-	return(1);
-}
-
-/*
- * Add a directory to the array.
- * Grow the array one-by-one for simplicity's sake.
- * Return 0 if the directory is not a real path.
- */
-static int
-manpath_add(struct manpaths *dirs, const char *dir) 
-{
-	char		 buf[PATH_MAX];
-	char		*cp;
-
-	if (NULL == (cp = realpath(dir, buf))) {
-		fprintf(stderr, "%s: Invalid path\n", dir);
-		return(0);
+	for (i = 0; i < sz; i++) {
+		printf("%s - %s\n", res[i].file, res[i].desc);
+		free(res[i].desc);
 	}
 
-	dirs->paths = mandoc_realloc
-		(dirs->paths, 
-		 ((size_t)dirs->sz + 1) * sizeof(char *));
-
-	dirs->paths[dirs->sz++] = mandoc_strdup(cp);
-	return(1);
+	free(res);
+	return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
+usage:
+	fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "
+			"[-S arch] [-s section]%s ...\n", progname,
+			whatis ? " name" : "\n               expression");
+	return(EXIT_FAILURE);
 }