diff options
-rw-r--r-- | mandocdb.c | 14 | ||||
-rw-r--r-- | mansearch.c | 4 | ||||
-rw-r--r-- | mansearch.h | 4 |
3 files changed, 17 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.96 2014/01/02 22:44:10 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.97 2014/01/05 00:29:54 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -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 7fb0a13c..886ceef3 100644 --- a/mansearch.c +++ b/mansearch.c @@ -1,4 +1,4 @@ -/* $Id: mansearch.c,v 1.13 2014/01/04 23:43:53 schwarze Exp $ */ +/* $Id: mansearch.c,v 1.14 2014/01/05 00:29:54 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -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 405826f0..0af83c60 100644 --- a/mansearch.h +++ b/mansearch.h @@ -1,4 +1,4 @@ -/* $Id: mansearch.h,v 1.6 2013/12/31 03:41:14 schwarze Exp $ */ +/* $Id: mansearch.h,v 1.7 2014/01/05 00:29:54 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org> @@ -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 |