===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/Attic/apropos.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/mandoc/Attic/apropos.c	2011/11/26 16:41:35	1.8
+++ src/usr.bin/mandoc/Attic/apropos.c	2011/11/28 00:16:38	1.9
@@ -1,4 +1,4 @@
-/*	$Id: apropos.c,v 1.8 2011/11/26 16:41:35 schwarze Exp $ */
+/*	$Id: apropos.c,v 1.9 2011/11/28 00:16:38 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,7 +34,7 @@
 int
 apropos(int argc, char *argv[])
 {
-	int		 ch, rc;
+	int		 ch, rc, whatis;
 	struct manpaths	 paths;
 	size_t		 terms;
 	struct opts	 opts;
@@ -49,12 +49,13 @@
 	else
 		++progname;
 
+	whatis = 0 == strncmp(progname, "whatis", 6);
+
 	memset(&paths, 0, sizeof(struct manpaths));
 	memset(&opts, 0, sizeof(struct opts));
 
 	auxpaths = defpaths = NULL;
 	e = NULL;
-	rc = 0;
 
 	while (-1 != (ch = getopt(argc, argv, "M:m:S:s:")))
 		switch (ch) {
@@ -72,20 +73,23 @@
 			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);
 
+	rc = 0;
+
 	manpath_parse(&paths, defpaths, auxpaths);
 
-	if (NULL == (e = exprcomp(argc, argv, &terms))) {
+	e = whatis ? termcomp(argc, argv, &terms) :
+		     exprcomp(argc, argv, &terms);
+		
+	if (NULL == e) {
 		fprintf(stderr, "%s: Bad expression\n", progname);
 		goto out;
 	}