===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.18
retrieving revision 1.27
diff -u -p -r1.18 -r1.27
--- mandoc/Attic/apropos.c	2011/11/23 09:50:40	1.18
+++ mandoc/Attic/apropos.c	2012/03/24 00:31:55	1.27
@@ -1,4 +1,4 @@
-/*	$Id: apropos.c,v 1.18 2011/11/23 09:50:40 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.27 2012/03/24 00:31:55 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -18,9 +18,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <sys/param.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,12 +39,14 @@ static	char	*progname;
 int
 main(int argc, char *argv[])
 {
-	int		 ch, rc;
+	int		 ch, rc, whatis;
+	struct res	*res;
 	struct manpaths	 paths;
-	size_t		 terms;
+	size_t		 terms, ressz;
 	struct opts	 opts;
 	struct expr	*e;
 	char		*defpaths, *auxpaths;
+	char		*conf_file;
 	extern int	 optind;
 	extern char	*optarg;
 
@@ -54,15 +56,22 @@ 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));
 
+	ressz = 0;
+	res = NULL;
 	auxpaths = defpaths = NULL;
+	conf_file = NULL;
 	e = NULL;
-	rc = 0;
 
-	while (-1 != (ch = getopt(argc, argv, "M: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;
@@ -77,36 +86,39 @@ main(int argc, char *argv[])
 			break;
 		default:
 			usage();
-			goto out;
+			return(EXIT_FAILURE);
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	if (0 == argc) {
-		rc = 1;
-		goto out;
-	}
+	if (0 == argc) 
+		return(EXIT_SUCCESS);
 
-	manpath_parse(&paths, defpaths, auxpaths);
+	rc = 0;
 
-	if (NULL == (e = exprcomp(argc, argv, &terms))) {
+	manpath_parse(&paths, conf_file, defpaths, auxpaths);
+
+	e = whatis ? termcomp(argc, argv, &terms) :
+		     exprcomp(argc, argv, &terms);
+		
+	if (NULL == e) {
 		fprintf(stderr, "%s: Bad expression\n", progname);
 		goto out;
 	}
 
 	rc = apropos_search
-		(paths.sz, paths.paths, 
-		 &opts, e, terms, NULL, list);
+		(paths.sz, paths.paths, &opts, 
+		 e, terms, NULL, &ressz, &res, list);
 
-	if (0 == rc) 
-		fprintf(stderr, "%s: Error reading "
-				"manual database\n", progname);
-
+	if (0 == rc) {
+		fprintf(stderr, "%s: Bad database\n", progname);
+		goto out;
+	}
 out:
 	manpath_free(&paths);
+	resfree(res, ressz);
 	exprfree(e);
-
 	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
@@ -114,23 +126,27 @@ out:
 static void
 list(struct res *res, size_t sz, void *arg)
 {
-	int		 i;
+	size_t		 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, 
+	for (i = 0; i < sz; i++) {
+		if ( ! res[i].matched)
+			continue;
+		printf("%s(%s%s%s) - %.70s\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,
+	return(strcasecmp(((const struct res *)p1)->title,
 				((const struct res *)p2)->title));
 }
 
@@ -139,9 +155,11 @@ usage(void)
 {
 
 	fprintf(stderr, "usage: %s "
-			"[-M dirs] "
-			"[-m dirs] "
+			"[-C file] "
+			"[-M manpath] "
+			"[-m manpath] "
 			"[-S arch] "
 			"[-s section] "
-			"expression...\n", progname);
+			"expression ...\n",
+			progname);
 }