mdocml: Render roff escape sequences contained in manual page

mdocml: Render roff escape sequences contained in manual page

[schwarze]

Log Message:
-----------
Render roff escape sequences contained in manual page descriptions 
before putting them into the mpages table.
Issue found by bentley@ in OpenBSD::Getopt(3p).

Modified Files:
--------------
    mdocml:
        mandocdb.c

Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandocdb.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.147 -r1.148
--- mandocdb.c
+++ mandocdb.c
@@ -2036,12 +2036,21 @@ dbadd(struct mpage *mpage, struct mchars
 	if (debug)
 		say(mlink->file, "Adding to database");
 
+	i = strlen(mpage->desc) + 1;
+	key = mandoc_calloc(1, sizeof(struct str) + i);
+	memcpy(key->key, mpage->desc, i);
+	render_key(mc, key);
+
 	i = 1;
-	SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->desc);
+	SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, key->rendered);
 	SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
 	SQL_STEP(stmts[STMT_INSERT_PAGE]);
 	mpage->pageid = sqlite3_last_insert_rowid(db);
 	sqlite3_reset(stmts[STMT_INSERT_PAGE]);
+
+	if (key->rendered != key->key)
+		free(key->rendered);
+	free(key);
 
 	while (NULL != mlink) {
 		dbadd_mlink(mlink);
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv