===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -p -r1.8 -r1.10
--- mandoc/Attic/mandoc-db.c	2011/04/05 14:10:52	1.8
+++ mandoc/Attic/mandoc-db.c	2011/04/11 21:36:44	1.10
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.8 2011/04/05 14:10:52 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.10 2011/04/11 21:36:44 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -68,13 +68,11 @@ static	void		  dbt_appendb(DBT *, 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);
@@ -219,17 +217,18 @@ main(int argc, char *argv[])
 	struct mdoc	*mdoc; /* resulting mdoc */
 	struct man	*man; /* resulting man */
 	char		*fn;
-	const char	*dir; /* result dir (default: cwd) */
+	const char	*msec,
+	      		*dir; /* result dir (default: cwd) */
 	char		 ibuf[MAXPATHLEN], /* index fname */
 			 ibbuf[MAXPATHLEN], /* index backup fname */
 			 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 */
-	size_t		 ksz; /* entry buffer size */
+	size_t		 ksz, rsz; /* entry buffer size */
 	char		 vbuf[8];
 	BTREEINFO	 info; /* btree configuration */
 	recno_t		 rec;
@@ -304,7 +303,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);
@@ -331,7 +330,7 @@ main(int argc, char *argv[])
 	rkey.size = sizeof(recno_t);
 
 	rec = 1;
-	ksz = 0;
+	ksz = rsz = 0;
 
 	while (NULL != (fn = *argv++)) {
 		mparse_reset(mp);
@@ -345,31 +344,35 @@ main(int argc, char *argv[])
 		if (NULL == mdoc && NULL == man)
 			continue;
 
+		msec = NULL != mdoc ? 
+			mdoc_meta(mdoc)->msec :
+			man_meta(man)->msec;
+
 		rkey.data = &rec;
-		rval.data = fn;
-		rval.size = strlen(fn) + 1;
 
-		if (-1 == (*index->put)(index, &rkey, &rval, 0)) {
-			perror(ibbuf);
-			break;
-		}
+		dbt_init(&rval, &rsz);
+		dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1);
+		dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1);
 
+		dbt_put(idx, ibbuf, &rkey, &rval);
+
 		memset(val.data, 0, sizeof(uint32_t));
 		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);
 
 	free(key.data);
+	free(rval.data);
 
 	/* Atomically replace the file with our temporary one. */
 
@@ -449,7 +452,7 @@ pmdoc_Fd(MDOC_ARGS)
 	uint32_t	 fl;
 	const char	*start, *end;
 	size_t		 sz;
-	char		 nil;
+	const char	 nil = '\0';
 	
 	if (SEC_SYNOPSIS != n->sec)
 		return;
@@ -482,7 +485,6 @@ pmdoc_Fd(MDOC_ARGS)
 	if ('>' == *end || '"' == *end)
 		end--;
 
-	nil = '\0';
 	dbt_appendb(key, ksz, start, end - start + 1);
 	dbt_appendb(key, ksz, &nil, 1);
 
@@ -541,7 +543,7 @@ pmdoc_Vt(MDOC_ARGS)
 	uint32_t	 fl;
 	const char	*start, *end;
 	size_t		 sz;
-	char		 nil;
+	const char	 nil = '\0';
 	
 	if (SEC_SYNOPSIS != n->sec)
 		return;
@@ -569,7 +571,6 @@ pmdoc_Vt(MDOC_ARGS)
 	if (end == start)
 		return;
 
-	nil = '\0';
 	dbt_appendb(key, ksz, start, end - start + 1);
 	dbt_appendb(key, ksz, &nil, 1);
 	fl = MANDOC_VARIABLE;
@@ -628,7 +629,7 @@ dbt_put(DB *db, const char *dbn, DBT *key, DBT *val)
 		return;
 
 	assert(key->data);
-	assert(8 == val->size);
+	assert(val->size);
 	assert(val->data);
 
 	if (0 == (*db->put)(db, key, val, 0))
@@ -681,7 +682,7 @@ pman_node(MAN_ARGS)
 {
 	const struct man_node *head, *body;
 	const char	*start;
-	char		 nil;
+	const char	 nil = '\0';
 	size_t		 sz;
 	uint32_t	 fl;
 
@@ -705,7 +706,6 @@ pman_node(MAN_ARGS)
 				0 == strcmp(head->string, "NAME") &&
 				NULL != (body = body->child) &&
 				MAN_TEXT == body->type) {
-			nil = '\0';
 
 			fl = MANDOC_NAME;
 			memcpy(val->data, &fl, 4);
@@ -754,9 +754,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));
@@ -764,9 +763,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));