===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.35
retrieving revision 1.37
diff -u -p -r1.35 -r1.37
--- mandoc/mandocdb.c	2011/12/16 08:04:34	1.35
+++ mandoc/mandocdb.c	2011/12/20 21:41:11	1.37
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.35 2011/12/16 08:04:34 kristaps Exp $ */
+/*	$Id: mandocdb.c,v 1.37 2011/12/20 21:41:11 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -525,9 +525,11 @@ index_merge(const struct of *of, struct mparse *mp,
 	struct mdoc	*mdoc;
 	struct man	*man;
 	const char	*fn, *msec, *mtitle, *arch;
+	uint64_t	 mask;
 	size_t		 sv;
 	unsigned	 seq;
 	struct db_val	 vbuf;
+	char		 type;
 
 	for (rec = 0; of; of = of->next) {
 		fn = of->fname;
@@ -608,7 +610,8 @@ index_merge(const struct of *of, struct mparse *mp,
 		 */
 
 		dbuf->len = 0;
-		buf_append(dbuf, mdoc ? "mdoc" : (man ? "man" : "cat"));
+		type = mdoc ? 'd' : (man ? 'a' : 'c');
+		buf_appendb(dbuf, &type, 1);
 		buf_appendb(dbuf, fn, strlen(fn) + 1);
 		buf_appendb(dbuf, msec, strlen(msec) + 1);
 		buf_appendb(dbuf, mtitle, strlen(mtitle) + 1);
@@ -653,7 +656,9 @@ index_merge(const struct of *of, struct mparse *mp,
 		seq = R_FIRST;
 		while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) {
 			seq = R_NEXT;
-			vbuf.mask = htobe64(*(uint64_t *)val.data);
+			assert(sizeof(uint64_t) == val.size);
+			memcpy(&mask, val.data, val.size);
+			vbuf.mask = htobe64(mask);
 			val.size = sizeof(struct db_val);
 			val.data = &vbuf;
 			dbt_put(db, dbf, &key, &val);
@@ -696,7 +701,7 @@ index_prune(const struct of *ofile, DB *db, const char
 		recno_t **recs, size_t *recsz, size_t *reccur)
 {
 	const struct of	*of;
-	const char	*fn, *cp;
+	const char	*fn;
 	struct db_val	*vbuf;
 	unsigned	 seq, sseq;
 	DBT		 key, val;
@@ -706,8 +711,8 @@ index_prune(const struct of *ofile, DB *db, const char
 	seq = R_FIRST;
 	while (0 == (ch = (*idx->seq)(idx, &key, &val, seq))) {
 		seq = R_NEXT;
-		*maxrec = *(recno_t *)key.data;
-		cp = val.data;
+		assert(sizeof(recno_t) == key.size);
+		memcpy(maxrec, key.data, key.size);
 
 		/* Deleted records are zero-sized.  Skip them. */
 
@@ -721,12 +726,9 @@ index_prune(const struct of *ofile, DB *db, const char
 		 * Failing any of these, we go into our error handler.
 		 */
 
-		if (NULL == (fn = memchr(cp, '\0', val.size)))
+		fn = (char *)val.data + 1;
+		if (NULL == memchr(fn, '\0', val.size - 1))
 			break;
-		if (++fn - cp >= (int)val.size)
-			break;
-		if (NULL == memchr(fn, '\0', val.size - (fn - cp)))
-			break;
 
 		/* 
 		 * Search for the file in those we care about.
@@ -1070,6 +1072,7 @@ pmdoc_Sh(MDOC_ARGS)
 static void
 hash_put(DB *db, const struct buf *buf, uint64_t mask)
 {
+	uint64_t	 oldmask;
 	DBT		 key, val;
 	int		 rc;
 
@@ -1082,8 +1085,11 @@ hash_put(DB *db, const struct buf *buf, uint64_t mask)
 	if ((rc = (*db->get)(db, &key, &val, 0)) < 0) {
 		perror("hash");
 		exit((int)MANDOCLEVEL_SYSERR);
-	} else if (0 == rc)
-		mask |= *(uint64_t *)val.data;
+	} else if (0 == rc) {
+		assert(sizeof(uint64_t) == val.size);
+		memcpy(&oldmask, val.data, val.size);
+		mask |= oldmask;
+	}
 
 	val.data = &mask;
 	val.size = sizeof(uint64_t);