Note that archives are being hosted at gmane.

[mandoc.git] / apropos_db.h

diff --git a/apropos_db.h b/apropos_db.h
index 95d5001a2152356bedb01a14491d04e97d28e4b7..be48b06311af145207d38e31ecb9c4029c89f23b 100644 (file)
--- a/apropos_db.h
+++ b/apropos_db.h
@@ -1,4 +1,4 @@
-/*     $Id: apropos_db.h,v 1.4 2011/11/14 10:07:06 kristaps Exp $ */
+/*     $Id: apropos_db.h,v 1.10 2011/11/27 23:11:37 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -17,7 +17,8 @@
 #ifndef APROPOS_H
 #define APROPOS_H
 
 #ifndef APROPOS_H
 #define APROPOS_H
 

-struct rec {
+struct res {
+       char            *type; /* file type: mdoc, man or cat */

        char            *file; /* file in file-system */
        char            *cat; /* category (3p, 3, etc.) */
        char            *title; /* title (FOO, etc.) */
        char            *file; /* file in file-system */
        char            *cat; /* category (3p, 3, etc.) */
        char            *title; /* title (FOO, etc.) */


@@ -25,15 +26,10 @@ struct      rec {
        char            *desc; /* description (from Nd) */
        unsigned int     rec; /* record in index */
        /*
        char            *desc; /* description (from Nd) */
        unsigned int     rec; /* record in index */
        /*

-        * By the time the apropos_search() callback is called, these
-        * are superfluous.
-        * Maintain a binary tree for checking the uniqueness of `rec'
-        * when adding elements to the results array.
-        * Since the results array is dynamic, use offset in the array
-        * instead of a pointer to the structure.
+        * The index volume.  This indexes into the array of directories
+        * searched for manual page databases.

         */
         */

-       int              lhs;
-       int              rhs;
+       unsigned int     volume;

 };
 
 struct opts {
 };
 
 struct opts {


@@ -45,12 +41,12 @@ __BEGIN_DECLS
 
 struct expr;
 
 
 struct expr;
 

-void            apropos_search(const struct opts *, 
-                       const struct expr *, void *, 
-                       void (*)(struct rec *, size_t, void *));
-
-struct expr    *exprcomp(char *);
+int             apropos_search(int, char **, const struct opts *,
+                       const struct expr *, size_t, void *,
+                       void (*)(struct res *, size_t, void *));
+struct expr    *exprcomp(int, char *[], size_t *);

 void            exprfree(struct expr *);
 void            exprfree(struct expr *);

+struct expr    *termcomp(int, char *[], size_t *);

 
 __END_DECLS
 
 
 __END_DECLS