aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2013-12-27 18:42:25 +0000
committerIngo Schwarze <schwarze@openbsd.org>2013-12-27 18:42:25 +0000
commitf025d38ef1ad098b22a683e883f7b6ddce37cd66 (patch)
tree4c3d51ed64e10bb58d1c1bb11eeb86371377a8b2
parent04bbfabc2f442db91e4082cd1a5467df45286b74 (diff)
downloadmandoc-f025d38ef1ad098b22a683e883f7b6ddce37cd66.tar.gz
mandoc-f025d38ef1ad098b22a683e883f7b6ddce37cd66.tar.zst
mandoc-f025d38ef1ad098b22a683e883f7b6ddce37cd66.zip
Save the MLINK name into the database, too;
apropos(1) will need it to display its results.
-rw-r--r--mandocdb.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mandocdb.c b/mandocdb.c
index aee91d71..d6c2bff2 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/* $Id: mandocdb.c,v 1.87 2013/12/27 16:40:35 schwarze Exp $ */
+/* $Id: mandocdb.c,v 1.88 2013/12/27 18:42:25 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -1806,9 +1806,10 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
i = 1;
+ SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file);
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);
SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);
- SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file);
+ SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name);
SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno);
SQL_STEP(stmts[STMT_INSERT_LINK]);
sqlite3_reset(stmts[STMT_INSERT_LINK]);
@@ -1948,6 +1949,7 @@ dbopen(int real)
");\n"
"\n"
"CREATE TABLE \"mlinks\" (\n"
+ " \"file\" TEXT NOT NULL,\n"
" \"sec\" TEXT NOT NULL,\n"
" \"arch\" TEXT NOT NULL,\n"
" \"name\" TEXT NOT NULL,\n"
@@ -1980,7 +1982,7 @@ prepare_statements:
"(file,sec,arch,desc,form) VALUES (?,?,?,?,?)";
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);
sql = "INSERT INTO mlinks "
- "(sec,arch,name,pageid) VALUES (?,?,?,?)";
+ "(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)";
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
sql = "INSERT INTO keys "
"(bits,key,pageid) VALUES (?,?,?)";