===================================================================
RCS file: /cvs/mandoc/Attic/mandoc-db.c,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- mandoc/Attic/mandoc-db.c	2011/04/12 14:48:42	1.12
+++ mandoc/Attic/mandoc-db.c	2011/05/02 13:56:13	1.15
@@ -1,4 +1,4 @@
-/*	$Id: mandoc-db.c,v 1.12 2011/04/12 14:48:42 kristaps Exp $ */
+/*	$Id: mandoc-db.c,v 1.15 2011/05/02 13:56:13 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -48,7 +48,8 @@ enum	type {
 	MANDOC_FUNCTION,
 	MANDOC_UTILITY,
 	MANDOC_INCLUDES,
-	MANDOC_VARIABLE
+	MANDOC_VARIABLE,
+	MANDOC_STANDARD
 };
 
 #define	MAN_ARGS	  DB *db, \
@@ -82,6 +83,7 @@ static	void		  pmdoc_Fn(MDOC_ARGS);
 static	void		  pmdoc_Fo(MDOC_ARGS);
 static	void		  pmdoc_Nd(MDOC_ARGS);
 static	void		  pmdoc_Nm(MDOC_ARGS);
+static	void		  pmdoc_St(MDOC_ARGS);
 static	void		  pmdoc_Vt(MDOC_ARGS);
 
 typedef	void		(*pmdoc_nf)(MDOC_ARGS);
@@ -126,7 +128,7 @@ static	const pmdoc_nf	  mdocs[MDOC_MAX] = {
 	NULL, /* Ot */
 	NULL, /* Pa */
 	NULL, /* Rv */
-	NULL, /* St */ 
+	pmdoc_St, /* St */ 
 	pmdoc_Vt, /* Va */
 	pmdoc_Vt, /* Vt */ 
 	NULL, /* Xr */ 
@@ -451,6 +453,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;
 }
@@ -483,7 +527,6 @@ pmdoc_Fd(MDOC_ARGS)
 	uint32_t	 fl;
 	const char	*start, *end;
 	size_t		 sz;
-	const char	 nil = '\0';
 	
 	if (SEC_SYNOPSIS != n->sec)
 		return;
@@ -517,7 +560,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);
@@ -569,12 +612,27 @@ pmdoc_Fn(MDOC_ARGS)
 
 /* ARGSUSED */
 static void
+pmdoc_St(MDOC_ARGS)
+{
+	uint32_t	 fl;
+	
+	if (SEC_STANDARDS != n->sec)
+		return;
+	if (NULL == n->child || MDOC_TEXT != n->child->type)
+		return;
+
+	dbt_append(key, ksz, n->child->string);
+	fl = MANDOC_STANDARD;
+	memcpy(val->data, &fl, 4);
+}
+
+/* ARGSUSED */
+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;
@@ -595,15 +653,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);
 }
@@ -638,7 +696,6 @@ pmdoc_Nd(MDOC_ARGS)
 			dbt_appendb(rval, rsz, n->string, strlen(n->string) + 1);
 		else
 			dbt_append(rval, rsz, n->string);
-
 		first = 0;
 	}
 }
@@ -715,8 +772,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:
@@ -732,7 +789,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;
 
@@ -779,7 +835,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);