Integrate the makewhatis binary into the mandoc binary

[mandoc.git] / mansearch.h

diff --git a/mansearch.h b/mansearch.h
index 0aab4e763714e0b2fc7db971b88643f144fd157f..14ec8ceacd8756ff503360b3aac90b001599b52f 100644 (file)
--- a/mansearch.h
+++ b/mansearch.h
@@ -1,4 +1,4 @@
-/*     $Id: mansearch.h,v 1.18 2014/09/03 18:09:14 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>
 /*
  * 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.
  */
  * 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"
 
 
 #define        MANDOC_DB        "mandoc.db"
 


@@ -62,15 +60,14 @@
 #define        TYPE_Nd          0x0000008000000000ULL
 
 #define        NAME_SYN         0x0000004000000001ULL
 #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        NAME_MASK        0x000000000000001fULL
 
 #define        FORM_CAT         0  /* manual page is preformatted */
 #define        FORM_SRC         1  /* format is mdoc(7) or man(7) */

-#define        FORM_GZ          2  /* compressed with gzip(1) */

 #define        FORM_NONE        4  /* format is unknown */
 
 enum   argmode {
 #define        FORM_NONE        4  /* format is unknown */
 
 enum   argmode {


@@ -85,6 +82,7 @@ struct        manpage {
        char            *names; /* a list of names with sections */
        char            *output; /* user-defined additional output */
        size_t           ipath; /* number of the 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 */
 };
        int              sec; /* section number, 10 means invalid */
        int              form; /* 0 == catpage */
 };


@@ -94,10 +92,13 @@ struct      mansearch {
        const char      *sec; /* mansection/NULL */
        const char      *outkey; /* show content of this macro */
        enum argmode     argmode; /* interpretation of arguments */
        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
 
 };
 
 __BEGIN_DECLS
 

+struct manpaths;
+

 int    mansearch_setup(int);
 int    mansearch(const struct mansearch *cfg, /* options */
                const struct manpaths *paths, /* manpaths */
 int    mansearch_setup(int);
 int    mansearch(const struct mansearch *cfg, /* options */
                const struct manpaths *paths, /* manpaths */


@@ -108,5 +109,3 @@ int mansearch(const struct mansearch *cfg, /* options */
 void   mansearch_free(struct manpage *, size_t);
 
 __END_DECLS
 void   mansearch_free(struct manpage *, size_t);
 
 __END_DECLS

-
-#endif /* MANSEARCH_H */