diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2014-01-05 03:06:43 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-01-05 03:06:43 +0000 |
commit | bdcc37124aeee4069ccfb383b235e3f0efebdd5f (patch) | |
tree | b878003c4c8652140f9fb7e977a2c00af16e0587 /mandocdb.c | |
parent | 42e809e6f89c835d55a7d3f2046e28b6a227122a (diff) | |
download | mandoc-bdcc37124aeee4069ccfb383b235e3f0efebdd5f.tar.gz mandoc-bdcc37124aeee4069ccfb383b235e3f0efebdd5f.tar.zst mandoc-bdcc37124aeee4069ccfb383b235e3f0efebdd5f.zip |
Reimplement apropos -s NUM -S ARCH EXPR by internally converting it to
apropos \( EXPR \) -a 'sec~^NUM$' -a 'arch~^(ARCH|any)$'
in preparation for removal of sec and arch from the mpage table.
Almost no functional change except for the following bonus:
This also makes sure that for cross-section and cross-arch MLINKs,
all of the following work:
apropos -s 1 encrypt
apropos -s 8 encrypt
apropos -s 1 makekey
apropos -s 8 makekey
While here, print error messages about invalid regexps to stderr.
Diffstat (limited to 'mandocdb.c')
-rw-r--r-- | mandocdb.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.97 2014/01/05 00:29:54 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.98 2014/01/05 03:06:43 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1025,14 +1025,16 @@ mpages_merge(struct mchars *mc, struct mparse *mp, int check_reachable) mandoc_strdup(mpage->mlinks->name); } putkey(mpage, mpage->sec, TYPE_sec); - putkey(mpage, mpage->arch, TYPE_arch); + putkey(mpage, '\0' == *mpage->arch ? + "any" : 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, '\0' == *mlink->arch ? + "any" : mlink->arch, TYPE_arch); putkey(mpage, mlink->name, TYPE_Nm); } |