===================================================================
RCS file: /cvs/mandoc/Attic/makewhatis.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- mandoc/Attic/makewhatis.c	2011/06/21 13:54:05	1.5
+++ mandoc/Attic/makewhatis.c	2011/06/22 09:00:14	1.8
@@ -1,4 +1,4 @@
-/*	$Id: makewhatis.c,v 1.5 2011/06/21 13:54:05 kristaps Exp $ */
+/*	$Id: makewhatis.c,v 1.8 2011/06/22 09:00:14 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -52,7 +52,7 @@
 #define TYPE_STANDARD	0x20
 #define TYPE_AUTHOR	0x40
 #define TYPE_CONFIG	0x80
-#define	TYPE__MAX	TYPE_CONFIG
+#define TYPE_DESC	0x100
 
 /* Buffer for storing growable data. */
 
@@ -306,23 +306,14 @@ main(int argc, char *argv[])
 	 * For the keyword database, open a BTREE database that allows
 	 * duplicates.  
 	 * For the index database, use a standard RECNO database type.
-	 * For the temporary keyword hashtable, use the HASH database
-	 * type.
 	 */
 
-	hash = dbopen(NULL, MANDOC_FLAGS, 0644, DB_HASH, NULL);
-	if (NULL == hash) {
-		perror("hash");
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
-
 	memset(&info, 0, sizeof(BTREEINFO));
 	info.flags = R_DUP;
 	db = dbopen(fbbuf, MANDOC_FLAGS, 0644, DB_BTREE, &info);
 
 	if (NULL == db) {
 		perror(fbbuf);
-		(*hash->close)(hash);
 		exit((int)MANDOCLEVEL_SYSERR);
 	}
 
@@ -331,7 +322,6 @@ main(int argc, char *argv[])
 	if (NULL == db) {
 		perror(ibbuf);
 		(*db->close)(db);
-		(*hash->close)(hash);
 		exit((int)MANDOCLEVEL_SYSERR);
 	}
 
@@ -358,6 +348,16 @@ main(int argc, char *argv[])
 	while (NULL != (fn = *argv++)) {
 		mparse_reset(mp);
 
+		if (hash)
+			(*hash->close)(hash);
+
+		hash = dbopen(NULL, MANDOC_FLAGS, 0644, DB_HASH, NULL);
+
+		if (NULL == hash) {
+			perror("hash");
+			exit((int)MANDOCLEVEL_SYSERR);
+		}
+
 		/* Parse and get (non-empty) AST. */
 
 		if (mparse_readfd(mp, -1, fn) >= MANDOCLEVEL_FATAL) {
@@ -416,16 +416,18 @@ main(int argc, char *argv[])
 
 		seq = R_FIRST;
 		while (0 == (ch = (*hash->seq)(hash, &key, &val, seq))) {
+			seq = R_NEXT;
+
 			memcpy(vbuf, val.data, sizeof(uint32_t));
 			val.size = sizeof(vbuf);
 			val.data = vbuf;
+
+			printf("Added: %s (%zu): 0x%x\n",
+					(char *)key.data, key.size, 
+					*(int *)val.data);
+
 			dbt_put(db, fbbuf, &key, &val);
 
-			if ((*hash->del)(hash, &key, 0) < 0) {
-				perror("hash");
-				exit((int)MANDOCLEVEL_SYSERR);
-			}
-			seq = R_NEXT;
 		}
 
 		if (ch < 0) {
@@ -447,13 +449,16 @@ main(int argc, char *argv[])
 		val.data = dbuf.cp;
 		val.size = dbuf.len;
 
+		printf("Indexed: %s\n", fn);
+
 		dbt_put(idx, ibbuf, &key, &val);
 		rec++;
 	}
 
 	(*db->close)(db);
 	(*idx->close)(idx);
-	(*hash->close)(hash);
+	if (hash)
+		(*hash->close)(hash);
 
 	mparse_free(mp);
 
@@ -695,16 +700,25 @@ static void
 pmdoc_Nd(MDOC_ARGS)
 {
 	int		 first;
+	size_t		 sz;
 	
 	for (first = 1, n = n->child; n; n = n->next) {
 		if (MDOC_TEXT != n->type)
 			continue;
-		if (first) 
-			buf_appendb(dbuf, n->string, strlen(n->string) + 1);
-		else
+
+		if (first) {
+			sz = strlen(n->string) + 1;
+			buf_appendb(dbuf, n->string, sz);
+			buf_appendb(buf, n->string, sz);
+		} else {
 			buf_append(dbuf, n->string);
+			buf_append(buf, n->string);
+		}
+
 		first = 0;
 	}
+
+	hash_put(hash, buf, TYPE_DESC);
 }
 
 /* ARGSUSED */
@@ -737,11 +751,12 @@ hash_put(DB *db, const struct buf *buf, int mask)
 	DBT		 key, val;
 	int		 rc;
 
-	key.data = buf->cp;
-
-	if ((key.size = buf->len) < 2)
+	if (buf->len < 2)
 		return;
 
+	key.data = buf->cp;
+	key.size = buf->len;
+
 	if ((rc = (*db->get)(db, &key, &val, 0)) < 0) {
 		perror("hash");
 		exit((int)MANDOCLEVEL_SYSERR);
@@ -751,9 +766,6 @@ hash_put(DB *db, const struct buf *buf, int mask)
 	val.data = &mask;
 	val.size = sizeof(int); 
 
-	/*fprintf(stderr, "Hashing: [%s] (0x%x)\n", 
-			(char *)key.data, mask);*/
-
 	if ((rc = (*db->put)(db, &key, &val, 0)) < 0) {
 		perror("hash");
 		exit((int)MANDOCLEVEL_SYSERR);
@@ -764,9 +776,6 @@ static void
 dbt_put(DB *db, const char *dbn, DBT *key, DBT *val)
 {
 
-	if (0 == key->size)
-		return;
-
 	assert(key->size);
 	assert(val->size);
 
@@ -897,7 +906,9 @@ pman_node(MAN_ARGS)
 			while (' ' == *start)
 				start++;
 
-			buf_appendb(dbuf, start, strlen(start) + 1);
+			sz = strlen(start) + 1;
+			buf_appendb(dbuf, start, sz);
+			buf_appendb(buf, start, sz);
 		}
 	}