===================================================================
RCS file: /cvs/mandoc/mansearch.h,v
retrieving revision 1.16
retrieving revision 1.23
diff -u -p -r1.16 -r1.23
--- mandoc/mansearch.h	2014/08/17 03:24:47	1.16
+++ mandoc/mansearch.h	2014/12/01 08:05:52	1.23
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.h,v 1.16 2014/08/17 03:24:47 schwarze Exp $ */
+/*	$Id: mansearch.h,v 1.23 2014/12/01 08:05:52 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,8 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef MANSEARCH_H
-#define MANSEARCH_H
 
 #define	MANDOC_DB	 "mandoc.db"
 
@@ -62,12 +60,16 @@
 #define	TYPE_Nd		 0x0000008000000000ULL
 
 #define	NAME_SYN	 0x0000004000000001ULL
-#define	NAME_FILE	 0x0000004000000002ULL
-#define	NAME_TITLE	 0x000000400000000cULL
-#define	NAME_FIRST	 0x0000004000000008ULL
-#define	NAME_HEAD	 0x0000004000000010ULL
+#define	NAME_FIRST	 0x0000004000000004ULL
+#define	NAME_TITLE	 0x0000004000000006ULL
+#define	NAME_HEAD	 0x0000004000000008ULL
+#define	NAME_FILE	 0x0000004000000010ULL
 #define	NAME_MASK	 0x000000000000001fULL
 
+#define	FORM_CAT	 0  /* manual page is preformatted */
+#define	FORM_SRC	 1  /* format is mdoc(7) or man(7) */
+#define	FORM_NONE	 4  /* format is unknown */
+
 enum	argmode {
 	ARG_FILE = 0,
 	ARG_NAME,
@@ -79,6 +81,8 @@ struct	manpage {
 	char		*file; /* to be prefixed by manpath */
 	char		*names; /* a list of names with sections */
 	char		*output; /* user-defined additional output */
+	size_t		 ipath; /* number of the manpath */
+	uint64_t	 bits; /* name type mask */
 	int		 sec; /* section number, 10 means invalid */
 	int		 form; /* 0 == catpage */
 };
@@ -88,10 +92,13 @@ struct	mansearch {
 	const char	*sec; /* mansection/NULL */
 	const char	*outkey; /* show content of this macro */
 	enum argmode	 argmode; /* interpretation of arguments */
+	int		 firstmatch; /* first matching database only */
 };
 
 __BEGIN_DECLS
 
+struct	manpaths;
+
 int	mansearch_setup(int);
 int	mansearch(const struct mansearch *cfg, /* options */
 		const struct manpaths *paths, /* manpaths */
@@ -102,5 +109,3 @@ int	mansearch(const struct mansearch *cfg, /* options 
 void	mansearch_free(struct manpage *, size_t);
 
 __END_DECLS
-
-#endif /* MANSEARCH_H */