=================================================================== RCS file: /cvs/mandoc/Attic/apropos_db.h,v retrieving revision 1.7 retrieving revision 1.11 diff -u -p -r1.7 -r1.11 --- mandoc/Attic/apropos_db.h 2011/11/23 09:55:28 1.7 +++ mandoc/Attic/apropos_db.h 2011/12/16 12:06:35 1.11 @@ -1,4 +1,4 @@ -/* $Id: apropos_db.h,v 1.7 2011/11/23 09:55:28 kristaps Exp $ */ +/* $Id: apropos_db.h,v 1.11 2011/12/16 12:06:35 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -17,18 +17,25 @@ #ifndef APROPOS_H #define APROPOS_H +enum restype { + RESTYPE_MAN, /* man(7) file */ + RESTYPE_MDOC, /* mdoc(7) file */ + RESTYPE_CAT /* pre-formatted file */ +}; + struct res { + enum restype type; /* input file type */ char *file; /* file in file-system */ char *cat; /* category (3p, 3, etc.) */ char *title; /* title (FOO, etc.) */ char *arch; /* arch (or empty string) */ char *desc; /* description (from Nd) */ unsigned int rec; /* record in index */ - /* + /* * The index volume. This indexes into the array of directories * searched for manual page databases. */ - unsigned int volume; + unsigned int volume; }; struct opts { @@ -40,11 +47,12 @@ __BEGIN_DECLS struct expr; -int apropos_search(int, char **, const struct opts *, - const struct expr *, size_t, void *, +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 *); +struct expr *termcomp(int, char *[], size_t *); __END_DECLS