===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.13
retrieving revision 1.19
diff -u -p -r1.13 -r1.19
--- mandoc/Attic/mandoc-db.c	2011/04/28 10:44:02	1.13
+++ mandoc/Attic/mandoc-db.c	2011/05/04 20:43:38	1.19
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.13 2011/04/28 10:44:02 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.19 2011/05/04 20:43:38 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -49,7 +49,9 @@ enum	type {
 	MANDOC_UTILITY,
 	MANDOC_INCLUDES,
 	MANDOC_VARIABLE,
-	MANDOC_STANDARD
+	MANDOC_STANDARD,
+	MANDOC_AUTHOR,
+	MANDOC_CONFIG
 };
 
 #define	MAN_ARGS	  DB *db, \
@@ -77,6 +79,8 @@ static	int		  pman_node(MAN_ARGS);
 static	void		  pmdoc(DB *, const char *, DBT *, size_t *, 
 				DBT *, DBT *, size_t *, struct mdoc *);
 static	void		  pmdoc_node(MDOC_ARGS);
+static	void		  pmdoc_An(MDOC_ARGS);
+static	void		  pmdoc_Cd(MDOC_ARGS);
 static	void		  pmdoc_Fd(MDOC_ARGS);
 static	void		  pmdoc_In(MDOC_ARGS);
 static	void		  pmdoc_Fn(MDOC_ARGS);
@@ -106,9 +110,9 @@ static	const pmdoc_nf	  mdocs[MDOC_MAX] = {
 	NULL, /* El */
 	NULL, /* It */
 	NULL, /* Ad */ 
-	NULL, /* An */ 
+	pmdoc_An, /* An */ 
 	NULL, /* Ar */
-	NULL, /* Cd */ 
+	pmdoc_Cd, /* Cd */ 
 	NULL, /* Cm */
 	NULL, /* Dv */ 
 	NULL, /* Er */ 
@@ -223,6 +227,8 @@ main(int argc, char *argv[])
 	struct man	*man; /* resulting man */
 	char		*fn; /* current file being parsed */
 	const char	*msec, /* manual section */
+	      	 	*mtitle, /* manual title */
+			*arch, /* manual architecture */
 	      		*dir; /* result dir (default: cwd) */
 	char		 ibuf[MAXPATHLEN], /* index fname */
 			 ibbuf[MAXPATHLEN], /* index backup fname */
@@ -356,8 +362,13 @@ main(int argc, char *argv[])
 		msec = NULL != mdoc ? 
 			mdoc_meta(mdoc)->msec :
 			man_meta(man)->msec;
+		mtitle = NULL != mdoc ? 
+			mdoc_meta(mdoc)->title :
+			man_meta(man)->title;
+		arch = NULL != mdoc ? mdoc_meta(mdoc)->arch : NULL;
 
 		assert(msec);
+		assert(mtitle);
 
 		/* 
 		 * The index record value consists of a nil-terminated
@@ -370,6 +381,10 @@ main(int argc, char *argv[])
 		dbt_init(&rval, &rsz);
 		dbt_appendb(&rval, &rsz, fn, strlen(fn) + 1);
 		dbt_appendb(&rval, &rsz, msec, strlen(msec) + 1);
+		dbt_appendb(&rval, &rsz, mtitle, strlen(mtitle) + 1);
+		dbt_appendb(&rval, &rsz, arch ? arch : "", 
+				arch ? strlen(arch) + 1 : 1);
+
 		sv = rval.size;
 
 		/* Fix the record number in the btree value. */
@@ -453,6 +468,48 @@ dbt_appendb(DBT *key, size_t *ksz, const void *cp, siz
 		key->data = mandoc_realloc(key->data, *ksz);
 	}
 
+#if 0
+	dstp = key->data + (int)key->size;
+
+	while (NULL != (endp = memchr(cp, '\\', sz))) {
+		ssz = endp - cp;
+		memcpy(dstp, cp, ssz);
+
+		dstp += ssz;
+		key->size += ssz;
+		sz -= ssz;
+
+		cp = endp++;
+		/* FIXME: expects nil-terminated string! */
+		esc = mandoc_escape((const char **)&endp, NULL, NULL);
+
+		switch (esc) {
+		case (ESCAPE_ERROR):
+			/* Nil-terminate this point. */
+			memcpy(dstp, "", 1);
+			key->size++;
+			return;
+		case (ESCAPE_PREDEF):
+			/* FALLTHROUGH */
+		case (ESCAPE_SPECIAL):
+			break;
+		default:
+			sz -= endp - cp;
+			cp = endp;
+			continue;
+		}
+
+		ssz = endp - cp;
+		memcpy(dstp, cp, ssz);
+
+		dstp += ssz;
+		key->size += ssz;
+		sz -= ssz;
+
+		cp = endp;
+	}
+#endif
+
 	memcpy(key->data + (int)key->size, cp, sz);
 	key->size += sz;
 }
@@ -480,12 +537,28 @@ dbt_append(DBT *key, size_t *ksz, const char *cp)
 
 /* ARGSUSED */
 static void
+pmdoc_An(MDOC_ARGS)
+{
+	uint32_t	 fl;
+	
+	if (SEC_AUTHORS != n->sec)
+		return;
+
+	for (n = n->child; n; n = n->next)
+		if (MDOC_TEXT == n->type)
+			dbt_append(key, ksz, n->string);
+
+	fl = MANDOC_AUTHOR;
+	memcpy(val->data, &fl, 4);
+}
+
+/* ARGSUSED */
+static void
 pmdoc_Fd(MDOC_ARGS)
 {
 	uint32_t	 fl;
 	const char	*start, *end;
 	size_t		 sz;
-	const char	 nil = '\0';
 	
 	if (SEC_SYNOPSIS != n->sec)
 		return;
@@ -519,7 +592,7 @@ pmdoc_Fd(MDOC_ARGS)
 		end--;
 
 	dbt_appendb(key, ksz, start, end - start + 1);
-	dbt_appendb(key, ksz, &nil, 1);
+	dbt_appendb(key, ksz, "", 1);
 
 	fl = MANDOC_INCLUDES;
 	memcpy(val->data, &fl, 4);
@@ -527,6 +600,23 @@ pmdoc_Fd(MDOC_ARGS)
 
 /* ARGSUSED */
 static void
+pmdoc_Cd(MDOC_ARGS)
+{
+	uint32_t	 fl;
+	
+	if (SEC_SYNOPSIS != n->sec)
+		return;
+
+	for (n = n->child; n; n = n->next)
+		if (MDOC_TEXT == n->type)
+			dbt_append(key, ksz, n->string);
+
+	fl = MANDOC_CONFIG;
+	memcpy(val->data, &fl, 4);
+}
+
+/* ARGSUSED */
+static void
 pmdoc_In(MDOC_ARGS)
 {
 	uint32_t	 fl;
@@ -590,9 +680,8 @@ static void
 pmdoc_Vt(MDOC_ARGS)
 {
 	uint32_t	 fl;
-	const char	*start, *end;
+	const char	*start;
 	size_t		 sz;
-	const char	 nil = '\0';
 	
 	if (SEC_SYNOPSIS != n->sec)
 		return;
@@ -613,15 +702,15 @@ pmdoc_Vt(MDOC_ARGS)
 	if (0 == (sz = strlen(start)))
 		return;
 
-	end = &start[sz - 1];
-	while (end > start && ';' == *end)
-		end--;
+	if (';' == start[sz - 1])
+		sz--;
 
-	if (end == start)
+	if (0 == sz)
 		return;
 
-	dbt_appendb(key, ksz, start, end - start + 1);
-	dbt_appendb(key, ksz, &nil, 1);
+	dbt_appendb(key, ksz, start, sz);
+	dbt_appendb(key, ksz, "", 1);
+
 	fl = MANDOC_VARIABLE;
 	memcpy(val->data, &fl, 4);
 }
@@ -656,7 +745,6 @@ pmdoc_Nd(MDOC_ARGS)
 			dbt_appendb(rval, rsz, n->string, strlen(n->string) + 1);
 		else
 			dbt_append(rval, rsz, n->string);
-
 		first = 0;
 	}
 }
@@ -733,8 +821,8 @@ pmdoc_node(MDOC_ARGS)
 			break;
 
 		dbt_init(key, ksz);
-		(*mdocs[n->tok])(db, dbn, key, ksz, val, rval, rsz, n);
 
+		(*mdocs[n->tok])(db, dbn, key, ksz, val, rval, rsz, n);
 		dbt_put(db, dbn, key, val);
 		break;
 	default:
@@ -750,7 +838,6 @@ pman_node(MAN_ARGS)
 {
 	const struct man_node *head, *body;
 	const char	*start, *sv;
-	const char	 nil = '\0';
 	size_t		 sz;
 	uint32_t	 fl;
 
@@ -797,7 +884,7 @@ pman_node(MAN_ARGS)
 
 				dbt_init(key, ksz);
 				dbt_appendb(key, ksz, start, sz);
-				dbt_appendb(key, ksz, &nil, 1);
+				dbt_appendb(key, ksz, "", 1);
 
 				dbt_put(db, dbn, key, val);