===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.31
retrieving revision 1.33
diff -u -p -r1.31 -r1.33
--- mandoc/mandocdb.c	2011/12/09 11:16:34	1.31
+++ mandoc/mandocdb.c	2011/12/10 22:01:06	1.33
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.31 2011/12/09 11:16:34 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.33 2011/12/10 22:01:06 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -528,29 +528,15 @@ index_merge(const struct of *of, struct mparse *mp,
 		fn = of->fname;
 
 		/*
-		 * Reclaim an empty index record, if available.
+		 * Try interpreting the file as mdoc(7) or man(7)
+		 * source code, unless it is already known to be
+		 * formatted.  Fall back to formatted mode.
 		 */
 
-		if (reccur > 0) {
-			--reccur;
-			rec = recs[(int)reccur];
-		} else if (maxrec > 0) {
-			rec = maxrec;
-			maxrec = 0;
-		} else
-			rec++;
-
 		mparse_reset(mp);
-		hash_reset(&hash);
 		mdoc = NULL;
 		man = NULL;
 
-		/*
-		 * Try interpreting the file as mdoc(7) or man(7)
-		 * source code, unless it is already known to be
-		 * formatted.  Fall back to formatted mode.
-		 */
-
 		if ((MANDOC_SRC & of->src_form ||
 		    ! (MANDOC_FORM & of->src_form)) &&
 		    MANDOCLEVEL_FATAL > mparse_readfd(mp, -1, fn))
@@ -579,14 +565,14 @@ index_merge(const struct of *of, struct mparse *mp,
 		if (0 == use_all) {
 			assert(of->sec);
 			assert(msec);
-			if (strcmp(msec, of->sec))
+			if (strcasecmp(msec, of->sec))
 				continue;
 
 			if (NULL == arch) {
 				if (NULL != of->arch)
 					continue;
 			} else if (NULL == of->arch ||
-					strcmp(arch, of->arch))
+					strcasecmp(arch, of->arch))
 				continue;
 		}
 
@@ -625,8 +611,12 @@ index_merge(const struct of *of, struct mparse *mp,
 
 		sv = dbuf->len;
 
-		/* Fix the record number in the btree value. */
+		/*
+		 * Collect keyword/mask pairs.
+		 * Each pair will become a new btree node.
+		 */
 
+		hash_reset(&hash);
 		if (mdoc)
 			pmdoc_node(hash, buf, dbuf,
 				mdoc_node(mdoc), mdoc_meta(mdoc));
@@ -636,11 +626,25 @@ index_merge(const struct of *of, struct mparse *mp,
 			pformatted(hash, buf, dbuf, of);
 
 		/*
-		 * Copy from the in-memory hashtable of pending keywords
-		 * into the database.
+		 * Reclaim an empty index record, if available.
+		 * Use its record number for all new btree nodes.
 		 */
 
+		if (reccur > 0) {
+			--reccur;
+			rec = recs[(int)reccur];
+		} else if (maxrec > 0) {
+			rec = maxrec;
+			maxrec = 0;
+		} else
+			rec++;
 		vbuf.rec = htobe32(rec);
+
+		/*
+		 * Copy from the in-memory hashtable of pending
+		 * keyword/mask pairs into the database.
+		 */
+
 		seq = R_FIRST;
 		while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) {
 			seq = R_NEXT;
@@ -1559,6 +1563,10 @@ ofile_dirbuild(const char *dir, const char* psec, cons
 			buf[0] = '\0';
 			strlcat(buf, dir, MAXPATHLEN);
 			p = strrchr(buf, '/');
+			if (NULL != parch && NULL != p)
+				for (p--; p > buf; p--)
+					if ('/' == *p)
+						break;
 			if (NULL == p)
 				p = buf;
 			else