===================================================================
RCS file: /cvs/mandoc/Attic/apropos_db.c,v
retrieving revision 1.17
retrieving revision 1.25
diff -u -p -r1.17 -r1.25
--- mandoc/Attic/apropos_db.c	2011/12/01 23:46:26	1.17
+++ mandoc/Attic/apropos_db.c	2011/12/16 12:07:45	1.25
@@ -1,4 +1,4 @@
-/*	$Id: apropos_db.c,v 1.17 2011/12/01 23:46:26 kristaps Exp $ */
+/*	$Id: apropos_db.c,v 1.25 2011/12/16 12:07:45 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,6 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <fcntl.h>
 #include <regex.h>
@@ -24,10 +28,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <arpa/inet.h>
-
-#ifdef __linux__
+#if defined(__linux__)
+# include <endian.h>
 # include <db_185.h>
+#elif defined(__APPLE__)
+# include <libkern/OSByteOrder.h>
+# include <db.h>
 #else
 # include <db.h>
 #endif
@@ -111,7 +117,7 @@ static	const struct type types[] = {
 	{ TYPE_Va, "Va" },
 	{ TYPE_Va, "Vt" },
 	{ TYPE_Xr, "Xr" },
-	{ INT_MAX, "any" },
+	{ UINT64_MAX, "any" },
 	{ 0, NULL }
 };
 
@@ -177,8 +183,8 @@ btree_read(const DBT *k, const DBT *v, 
 
 	vp = v->data;
 	norm_string((const char *)k->data, mc, buf);
-	dbv->rec = ntohl(vp->rec);
-	dbv->mask = vp->mask;
+	dbv->rec = betoh32(vp->rec);
+	dbv->mask = betoh64(vp->mask);
 	return(1);
 }
 
@@ -359,6 +365,7 @@ index_read(const DBT *key, const DBT *val, int index,
 {
 	size_t		 left;
 	char		*np, *cp;
+	char		 type;
 
 #define	INDEX_BREAD(_dst) \
 	do { \
@@ -369,13 +376,23 @@ index_read(const DBT *key, const DBT *val, int index,
 		cp = np + 1; \
 	} while (/* CONSTCOND */ 0)
 
-	left = val->size;
-	cp = (char *)val->data;
+	if (0 == (left = val->size))
+		return(0);
 
+	cp = val->data;
 	rec->res.rec = *(recno_t *)key->data;
 	rec->res.volume = index;
 
-	INDEX_BREAD(rec->res.type);
+	if ('d' == (type = *cp++))
+		rec->res.type = RESTYPE_MDOC;
+	else if ('a' == type)
+		rec->res.type = RESTYPE_MAN;
+	else if ('c' == type)
+		rec->res.type = RESTYPE_CAT;
+	else
+		return(0);
+
+	left--;
 	INDEX_BREAD(rec->res.file);
 	INDEX_BREAD(rec->res.cat);
 	INDEX_BREAD(rec->res.title);
@@ -535,13 +552,16 @@ single_search(struct rectree *tree, const struct opts 
 
 		if (opts->cat && strcasecmp(opts->cat, r.res.cat))
 			continue;
-		if (opts->arch && strcasecmp(opts->arch, r.res.arch))
-			continue;
 
+		if (opts->arch && *r.res.arch)
+			if (strcasecmp(opts->arch, r.res.arch))
+				continue;
+
 		tree->node = rs = mandoc_realloc
 			(rs, (tree->len + 1) * sizeof(struct rec));
 
 		memcpy(&rs[tree->len], &r, sizeof(struct rec));
+		memset(&r, 0, sizeof(struct rec));
 		rs[tree->len].matches =
 			mandoc_calloc(terms, sizeof(int));
 
@@ -557,7 +577,6 @@ single_search(struct rectree *tree, const struct opts 
 		} else
 			root = tree->len;
 
-		memset(&r, 0, sizeof(struct rec));
 		tree->len++;
 	}
 
@@ -565,6 +584,7 @@ single_search(struct rectree *tree, const struct opts 
 	(*idx->close)(idx);
 
 	free(buf);
+	recfree(&r);
 	return(1 == ch);
 }
 
@@ -572,7 +592,6 @@ static void
 recfree(struct rec *rec)
 {
 
-	free(rec->res.type);
 	free(rec->res.file);
 	free(rec->res.cat);
 	free(rec->res.title);