From 54a35af24eafe969f6b7acd3eb923ffa75bfb0ab Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 5 Jan 2014 00:29:54 +0000 Subject: Put section and architecture info into the keys table, in preparation for removing them from the mpages table, aiming for cleaner and more uniform interfaces. Database growth is below 4%, part of which will be reclaimed. As a bonus, this allows searches like: ./obj/apropos An=kettenis -a arch=ppc ./obj/apropos An=kettenis -a sec~[^4] --- mandocdb.c | 12 ++++++++++-- mansearch.c | 2 ++ mansearch.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mandocdb.c b/mandocdb.c index c6e8ff7c..c6680163 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -1024,9 +1024,17 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int check_reachable) mpage->title = mandoc_strdup(mpage->mlinks->name); } - - for (mlink = mpage->mlinks; mlink; mlink = mlink->next) + putkey(mpage, mpage->sec, TYPE_sec); + putkey(mpage, mpage->arch, TYPE_arch); + + for (mlink = mpage->mlinks; mlink; mlink = mlink->next) { + if ('\0' != *mlink->dsec) + putkey(mpage, mlink->dsec, TYPE_sec); + if ('\0' != *mlink->fsec) + putkey(mpage, mlink->fsec, TYPE_sec); + putkey(mpage, mlink->arch, TYPE_arch); putkey(mpage, mlink->name, TYPE_Nm); + } if (warnings && !use_all) { match = 0; diff --git a/mansearch.c b/mansearch.c index 48edb2f5..6db43e4e 100644 --- a/mansearch.c +++ b/mansearch.c @@ -120,6 +120,8 @@ static const struct type types[] = { { TYPE_Va, "Va" }, { TYPE_Va, "Vt" }, { TYPE_Xr, "Xr" }, + { TYPE_sec, "sec" }, + { TYPE_arch,"arch" }, { ~0ULL, "any" }, { 0ULL, NULL } }; diff --git a/mansearch.h b/mansearch.h index bbf01386..1339a5de 100644 --- a/mansearch.h +++ b/mansearch.h @@ -58,6 +58,8 @@ #define TYPE_Va 0x0000000800000000ULL #define TYPE_Vt 0x0000001000000000ULL #define TYPE_Xr 0x0000002000000000ULL +#define TYPE_sec 0x0000004000000000ULL +#define TYPE_arch 0x0000008000000000ULL __BEGIN_DECLS -- cgit