===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- mandoc/Attic/apropos.c	2011/10/09 10:35:12	1.5
+++ mandoc/Attic/apropos.c	2011/10/09 10:46:38	1.7
@@ -1,4 +1,4 @@
-/*	$Id: apropos.c,v 1.5 2011/10/09 10:35:12 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.7 2011/10/09 10:46:38 kristaps Exp $ */
 /*
 * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -152,7 +152,7 @@ static	int	 sort_title(const void *, const void *);
 static	int	 state_getrecord(struct state *, 
 			recno_t, struct rec *);
 static	void	 state_output(const struct res *, int);
-static	void	 state_search(struct state *, 
+static	int	 state_search(struct state *, 
 			const struct opts *, char *);
 static	void	 usage(void);
 
@@ -275,9 +275,8 @@ main(int argc, char *argv[])
 
 	/* Main search function. */
 
-	state_search(&state, &opts, q);
-
-	rc = EXIT_SUCCESS;
+	rc = state_search(&state, &opts, q) ?
+		EXIT_SUCCESS : EXIT_FAILURE;
 out:
 	if (state.db)
 		(*state.db->close)(state.db);
@@ -287,10 +286,10 @@ out:
 	return(rc);
 }
 
-static void
+static int
 state_search(struct state *p, const struct opts *opts, char *q)
 {
-	int		 leaf, root, len, ch, rflags, dflag;
+	int		 leaf, root, len, ch, dflag, rc;
 	struct mchars	*mc;
 	char		*buf;
 	size_t		 bufsz;
@@ -303,12 +302,12 @@ state_search(struct state *p, const struct opts *opts,
 	char		 filebuf[10];
 	struct rec	 record;
 
+	rc = 0;
 	root = leaf = -1;
 	res = NULL;
 	len = 0;
 	buf = NULL;
 	bufsz = 0;
-	ch = 0;
 	regp = NULL;
 
 	/*
@@ -318,12 +317,12 @@ state_search(struct state *p, const struct opts *opts,
 
 	switch (opts->match) {
 	case (MATCH_REGEX):
-		rflags = REG_EXTENDED | REG_NOSUB | 
+		ch = REG_EXTENDED | REG_NOSUB | 
 			(opts->insens ? REG_ICASE : 0);
 
-		if (0 != regcomp(&reg, q, rflags)) {
+		if (0 != regcomp(&reg, q, ch)) {
 			fprintf(stderr, "%s: Bad pattern\n", q);
-			return;
+			return(0);
 		}
 
 		regp = &reg;
@@ -339,10 +338,7 @@ state_search(struct state *p, const struct opts *opts,
 		break;
 	}
 
-	if (NULL == (mc = mchars_alloc())) {
-		perror(NULL);
-		exit(EXIT_FAILURE);
-	}
+	mc = mchars_alloc();
 
 	/*
 	 * Iterate over the entire keyword database.
@@ -362,8 +358,8 @@ state_search(struct state *p, const struct opts *opts,
 		 */
 
 		if (key.size < 2 || 8 != val.size) {
-			fprintf(stderr, "%s: Corrupt database\n", p->dbf);
-			exit(EXIT_FAILURE);
+			fprintf(stderr, "%s: Bad database\n", p->dbf);
+			goto out;
 		}
 
 		buf_redup(mc, &buf, &bufsz, (char *)key.data);
@@ -400,7 +396,7 @@ state_search(struct state *p, const struct opts *opts,
 		memcpy(&rec, val.data + 4, sizeof(recno_t));
 
 		if ( ! state_getrecord(p, rec, &record))
-			exit(EXIT_FAILURE);
+			goto out;
 
 		/* If we're in a different section, skip... */
 
@@ -460,35 +456,21 @@ state_search(struct state *p, const struct opts *opts,
 		len++;
 	}
 
-send:
 	if (ch < 0) {
 		perror(p->dbf);
-		exit(EXIT_FAILURE);
+		goto out;
 	} 
+send:
+	/* Sort our results. */
 
-	/*
-	 * Sort our results.
-	 * We do this post-scan (instead of an in-line sort) because
-	 * it's more or less the same in terms of run-time.  Assuming we
-	 * sort in-line with a tree versus post:
-	 * 
-	 *  In-place: n * O(lg n)
-	 *  After: n + O(n lg n)
-	 *
-	 * Whatever.  This also buys us simplicity.
-	 */
-
-	switch (opts->sort) {
-	case (SORT_CAT):
+	if (SORT_CAT == opts->sort)
 		qsort(res, len, sizeof(struct res), sort_cat);
-		break;
-	default:
+	else
 		qsort(res, len, sizeof(struct res), sort_title);
-		break;
-	}
 
 	state_output(res, len);
-
+	rc = 1;
+out:
 	for (len-- ; len >= 0; len--) {
 		free(res[len].keyword);
 		free(res[len].title);
@@ -504,6 +486,8 @@ send:
 
 	if (regp)
 		regfree(regp);
+
+	return(rc);
 }
 
 /*