diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-05-07 16:19:03 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-05-07 16:19:03 +0000 |
| commit | 5c195601f70dee7550a601ff2db5bdda18b6ba83 (patch) | |
| tree | a65801fb8b6e43a7d3acf0f59e986286ec45b7d1 /mandocdb.c | |
| parent | ad9934ce8bce7df653e1eec762a8e13b6ca42b55 (diff) | |
| download | mandoc-5c195601f70dee7550a601ff2db5bdda18b6ba83.tar.gz mandoc-5c195601f70dee7550a601ff2db5bdda18b6ba83.tar.zst mandoc-5c195601f70dee7550a601ff2db5bdda18b6ba83.zip | |
Render roff escape sequences contained in manual page descriptions
before putting them into the mpages table.
Issue found by bentley@ in OpenBSD::Getopt(3p).
Diffstat (limited to 'mandocdb.c')
| -rw-r--r-- | mandocdb.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.147 2014/05/07 15:10:36 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.148 2014/05/07 16:19:03 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -2036,13 +2036,22 @@ dbadd(struct mpage *mpage, struct mchars *mc) 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); mlink = mlink->next; |