===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -p -r1.6 -r1.9
--- mandoc/Attic/mandoc-db.c	2011/04/05 13:09:33	1.6
+++ mandoc/Attic/mandoc-db.c	2011/04/05 14:16:05	1.9
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.6 2011/04/05 13:09:33 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.9 2011/04/05 14:16:05 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -66,14 +66,13 @@ static	void		  dbt_append(DBT *, size_t *, const char 
 static	void		  dbt_appendb(DBT *, size_t *, 
 				const void *, size_t);
 static	void		  dbt_init(DBT *, size_t *);
+static	void		  dbt_put(DB *, const char *, DBT *, DBT *);
 static	void		  usage(void);
-static	void		  pman(DB *, const char *, 
-				DBT *, size_t *, DBT *, 
-				const char *, struct man *);
+static	void		  pman(DB *, const char *, DBT *, 
+				size_t *, DBT *, struct man *);
 static	int		  pman_node(MAN_ARGS);
-static	void		  pmdoc(DB *, const char *, 
-				DBT *, size_t *, DBT *, 
-				const char *, struct mdoc *);
+static	void		  pmdoc(DB *, const char *, DBT *, 
+				size_t *, DBT *, struct mdoc *);
 static	void		  pmdoc_node(MDOC_ARGS);
 static	void		  pmdoc_Fd(MDOC_ARGS);
 static	void		  pmdoc_In(MDOC_ARGS);
@@ -224,7 +223,7 @@ main(int argc, char *argv[])
 			 fbuf[MAXPATHLEN],  /* btree fname */
 			 fbbuf[MAXPATHLEN]; /* btree backup fname */
 	int		 c;
-	DB		*index, /* index database */
+	DB		*idx, /* index database */
 			*db; /* keyword database */
 	DBT		 rkey, rval, /* recno entries */
 			 key, val; /* persistent keyword entries */
@@ -303,7 +302,7 @@ main(int argc, char *argv[])
 		exit((int)MANDOCLEVEL_SYSERR);
 	}
 
-	index = dbopen(ibbuf, MANDOC_FLAGS, 0644, DB_RECNO, NULL);
+	idx = dbopen(ibbuf, MANDOC_FLAGS, 0644, DB_RECNO, NULL);
 
 	if (NULL == db) {
 		perror(ibbuf);
@@ -348,7 +347,7 @@ main(int argc, char *argv[])
 		rval.data = fn;
 		rval.size = strlen(fn) + 1;
 
-		if (-1 == (*index->put)(index, &rkey, &rval, 0)) {
+		if (-1 == (*idx->put)(idx, &rkey, &rval, 0)) {
 			perror(ibbuf);
 			break;
 		}
@@ -357,14 +356,14 @@ main(int argc, char *argv[])
 		memcpy(val.data + 4, &rec, sizeof(uint32_t));
 
 		if (mdoc)
-			pmdoc(db, fbbuf, &key, &ksz, &val, fn, mdoc);
+			pmdoc(db, fbbuf, &key, &ksz, &val, mdoc);
 		else 
-			pman(db, fbbuf, &key, &ksz, &val, fn, man);
+			pman(db, fbbuf, &key, &ksz, &val, man);
 		rec++;
 	}
 
 	(*db->close)(db);
-	(*index->close)(index);
+	(*idx->close)(idx);
 
 	mparse_free(mp);
 
@@ -546,7 +545,7 @@ pmdoc_Vt(MDOC_ARGS)
 		return;
 	if (MDOC_Vt == n->tok && MDOC_BODY != n->type)
 		return;
-	if (NULL == n->child || MDOC_TEXT != n->child->type)
+	if (NULL == n->last || MDOC_TEXT != n->last->type)
 		return;
 
 	/*
@@ -619,6 +618,25 @@ pmdoc_Nm(MDOC_ARGS)
 	memcpy(val->data, &fl, 4);
 }
 
+static void
+dbt_put(DB *db, const char *dbn, DBT *key, DBT *val)
+{
+
+	if (0 == key->size)
+		return;
+
+	assert(key->data);
+	assert(8 == val->size);
+	assert(val->data);
+
+	if (0 == (*db->put)(db, key, val, 0))
+		return;
+	
+	perror(dbn);
+	exit((int)MANDOCLEVEL_SYSERR);
+	/* NOTREACHED */
+}
+
 /*
  * Call out to per-macro handlers after clearing the persistent database
  * key.  If the macro sets the database key, flush it to the database.
@@ -646,14 +664,8 @@ pmdoc_node(MDOC_ARGS)
 		dbt_init(key, ksz);
 		(*mdocs[n->tok])(db, dbn, key, ksz, val, n);
 
-		if (0 == key->size)
-			break;
-		if (0 == (*db->put)(db, key, val, 0))
-			break;
-		
-		perror(dbn);
-		exit((int)MANDOCLEVEL_SYSERR);
-		/* NOTREACHED */
+		dbt_put(db, dbn, key, val);
+		break;
 	default:
 		break;
 	}
@@ -666,8 +678,9 @@ static int
 pman_node(MAN_ARGS)
 {
 	const struct man_node *head, *body;
-	const char	*end, *start;
+	const char	*start;
 	char		 nil;
+	size_t		 sz;
 	uint32_t	 fl;
 
 	if (NULL == n)
@@ -692,15 +705,40 @@ pman_node(MAN_ARGS)
 				MAN_TEXT == body->type) {
 			nil = '\0';
 
-			start = body->string;
-			if (NULL == (end = strchr(start, ' ')))
-				end = start + strlen(start);
-
-			dbt_init(key, ksz);
-			dbt_appendb(key, ksz, start, end - start + 1);
-			dbt_appendb(key, ksz, &nil, 1);
 			fl = MANDOC_NAME;
 			memcpy(val->data, &fl, 4);
+
+			start = body->string;
+
+			/* 
+			 * Go through a special heuristic dance here.
+			 * This is why -man manuals are great!
+			 * Conventionally, one or more manual names are
+			 * comma-specified prior to a whitespace, then a
+			 * dash, then a description.  Try to puzzle out
+			 * the name parts here.
+			 */
+
+			while (start) {
+				sz = strcspn(start, " ,");
+				if ('\0' == start[(int)sz])
+					break;
+
+				dbt_init(key, ksz);
+				dbt_appendb(key, ksz, start, sz);
+				dbt_appendb(key, ksz, &nil, 1);
+
+				dbt_put(db, dbn, key, val);
+
+				if (' ' == start[(int)sz])
+					break;
+
+				assert(',' == start[(int)sz]);
+				start += (int)sz + 1;
+				while (' ' == *start)
+					start++;
+			}
+
 			return(1);
 		}
 	}
@@ -714,9 +752,8 @@ pman_node(MAN_ARGS)
 }
 
 static void
-pman(DB *db, const char *dbn, 
-		DBT *key, size_t *ksz, DBT *val, 
-		const char *path, struct man *m)
+pman(DB *db, const char *dbn, DBT *key, 
+		size_t *ksz, DBT *val, struct man *m)
 {
 
 	pman_node(db, dbn, key, ksz, val, man_node(m));
@@ -724,9 +761,8 @@ pman(DB *db, const char *dbn, 
 
 
 static void
-pmdoc(DB *db, const char *dbn, 
-		DBT *key, size_t *ksz, DBT *val, 
-		const char *path, struct mdoc *m)
+pmdoc(DB *db, const char *dbn, DBT *key, 
+		size_t *ksz, DBT *val, struct mdoc *m)
 {
 
 	pmdoc_node(db, dbn, key, ksz, val, mdoc_node(m));