aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mansearch.h
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-04-30 18:51:57 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-04-30 18:51:57 +0000
commitd01c0c49e94a1aa06cfb7222d031a4d3e1f2e18a (patch)
tree528a8c13443fe687d14cca18e98f0010b56fdf1b /mansearch.h
parentc97489f192655f4c659019bb01065f81365849a8 (diff)
downloadmandoc-d01c0c49e94a1aa06cfb7222d031a4d3e1f2e18a.tar.gz
mandoc-d01c0c49e94a1aa06cfb7222d031a4d3e1f2e18a.tar.zst
mandoc-d01c0c49e94a1aa06cfb7222d031a4d3e1f2e18a.zip
In man(1) mode, i.e. when asking for a single manual page by name,
prefer file name matches over .Dt/.TH matches over first NAME matches over later NAME matches, but do not change the ordering for apropos(1) nor for man -a. This reverts main.c rev. 1.310 and mansearch.h rev. 1.29 and includes a partial revert of mansearch.c rev. 1.79. Regression reported by Lorenzo Beretta <loreb at github> as part of https://github.com/void-linux/void-packages/issues/9868 .
Diffstat (limited to 'mansearch.h')
-rw-r--r--mansearch.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/mansearch.h b/mansearch.h
index 355873f8..8a0aa121 100644
--- a/mansearch.h
+++ b/mansearch.h
@@ -1,4 +1,4 @@
-/* $Id: mansearch.h,v 1.29 2018/11/22 12:01:46 schwarze Exp $ */
+/* $Id: mansearch.h,v 1.30 2019/04/30 18:51:57 schwarze Exp $ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -92,6 +92,7 @@ struct manpage {
char *file; /* to be prefixed by manpath */
char *names; /* a list of names with sections */
char *output; /* user-defined additional output */
+ uint64_t bits; /* name type mask */
size_t ipath; /* number of the manpath */
int sec; /* section number, 10 means invalid */
enum form form;