===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- mandoc/Attic/mandoc-db.c	2011/04/04 16:49:03	1.5
+++ mandoc/Attic/mandoc-db.c	2011/04/05 14:10:52	1.8
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.5 2011/04/04 16:49:03 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.8 2011/04/05 14:10:52 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -51,6 +51,11 @@ enum	type {
 	MANDOC_VARIABLE
 };
 
+#define	MAN_ARGS	  DB *db, \
+			  const char *dbn, \
+			  DBT *key, size_t *ksz, \
+			  DBT *val, \
+			  const struct man_node *n
 #define	MDOC_ARGS	  DB *db, \
 			  const char *dbn, \
 			  DBT *key, size_t *ksz, \
@@ -61,7 +66,12 @@ 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	int		  pman_node(MAN_ARGS);
 static	void		  pmdoc(DB *, const char *, 
 				DBT *, size_t *, DBT *, 
 				const char *, struct mdoc *);
@@ -207,6 +217,7 @@ main(int argc, char *argv[])
 {
 	struct mparse	*mp; /* parse sequence */
 	struct mdoc	*mdoc; /* resulting mdoc */
+	struct man	*man; /* resulting man */
 	char		*fn;
 	const char	*dir; /* result dir (default: cwd) */
 	char		 ibuf[MAXPATHLEN], /* index fname */
@@ -330,8 +341,8 @@ main(int argc, char *argv[])
 			continue;
 		}
 
-		mparse_result(mp, &mdoc, NULL);
-		if (NULL == mdoc)
+		mparse_result(mp, &mdoc, &man);
+		if (NULL == mdoc && NULL == man)
 			continue;
 
 		rkey.data = &rec;
@@ -346,7 +357,10 @@ main(int argc, char *argv[])
 		memset(val.data, 0, sizeof(uint32_t));
 		memcpy(val.data + 4, &rec, sizeof(uint32_t));
 
-		pmdoc(db, fbbuf, &key, &ksz, &val, fn, mdoc);
+		if (mdoc)
+			pmdoc(db, fbbuf, &key, &ksz, &val, fn, mdoc);
+		else 
+			pman(db, fbbuf, &key, &ksz, &val, fn, man);
 		rec++;
 	}
 
@@ -533,7 +547,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;
 
 	/*
@@ -606,6 +620,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.
@@ -633,14 +666,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;
 	}
@@ -648,6 +675,93 @@ pmdoc_node(MDOC_ARGS)
 	pmdoc_node(db, dbn, key, ksz, val, n->child);
 	pmdoc_node(db, dbn, key, ksz, val, n->next);
 }
+
+static int
+pman_node(MAN_ARGS)
+{
+	const struct man_node *head, *body;
+	const char	*start;
+	char		 nil;
+	size_t		 sz;
+	uint32_t	 fl;
+
+	if (NULL == n)
+		return(0);
+
+	/*
+	 * We're only searching for one thing: the first text child in
+	 * the BODY of a NAME section.  Since we don't keep track of
+	 * sections in -man, run some hoops to find out whether we're in
+	 * the correct section or not.
+	 */
+
+	if (MAN_BODY == n->type && MAN_SH == n->tok) {
+		body = n;
+		assert(body->parent);
+		if (NULL != (head = body->parent->head) &&
+				1 == head->nchild &&
+				NULL != (head = (head->child)) &&
+				MAN_TEXT == head->type &&
+				0 == strcmp(head->string, "NAME") &&
+				NULL != (body = body->child) &&
+				MAN_TEXT == body->type) {
+			nil = '\0';
+
+			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);
+		}
+	}
+
+	if (pman_node(db, dbn, key, ksz, val, n->child))
+		return(1);
+	if (pman_node(db, dbn, key, ksz, val, n->next))
+		return(1);
+
+	return(0);
+}
+
+static void
+pman(DB *db, const char *dbn, 
+		DBT *key, size_t *ksz, DBT *val, 
+		const char *path, struct man *m)
+{
+
+	pman_node(db, dbn, key, ksz, val, man_node(m));
+}
+
 
 static void
 pmdoc(DB *db, const char *dbn,