=================================================================== RCS file: /cvs/mandoc/Attic/apropos_db.c,v retrieving revision 1.15 retrieving revision 1.22 diff -u -p -r1.15 -r1.22 --- mandoc/Attic/apropos_db.c 2011/11/28 09:44:05 1.15 +++ mandoc/Attic/apropos_db.c 2011/12/09 11:18:57 1.22 @@ -1,4 +1,4 @@ -/* $Id: apropos_db.c,v 1.15 2011/11/28 09:44:05 schwarze Exp $ */ +/* $Id: apropos_db.c,v 1.22 2011/12/09 11:18:57 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -15,6 +15,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include @@ -24,8 +28,12 @@ #include #include -#ifdef __linux__ +#if defined(__linux__) +# include # include +#elif defined(__APPLE__) +# include +# include #else # include #endif @@ -52,7 +60,6 @@ struct expr { int regex; /* is regex? */ int index; /* index in match array */ uint64_t mask; /* type-mask */ - int cs; /* is case-sensitive? */ int and; /* is rhs of logical AND? */ char *v; /* search value */ regex_t re; /* compiled re, if regex */ @@ -115,8 +122,9 @@ static const struct type types[] = { }; static DB *btree_open(void); -static int btree_read(const DBT *, - const struct mchars *, char **); +static int btree_read(const DBT *, const DBT *, + const struct mchars *, + struct db_val *, char **); static int expreval(const struct expr *, int *); static void exprexec(const struct expr *, const char *, uint64_t, struct rec *); @@ -159,17 +167,24 @@ btree_open(void) * Return 0 if the database is insane, else 1. */ static int -btree_read(const DBT *v, const struct mchars *mc, char **buf) +btree_read(const DBT *k, const DBT *v, + const struct mchars *mc, + struct db_val *dbv, char **buf) { + const struct db_val *vp; - /* Sanity: are we nil-terminated? */ + /* Are our sizes sane? */ + if (k->size < 2 || sizeof(struct db_val) != v->size) + return(0); - assert(v->size > 0); - - if ('\0' != ((char *)v->data)[(int)v->size - 1]) + /* Is our string nil-terminated? */ + if ('\0' != ((const char *)k->data)[(int)k->size - 1]) return(0); - norm_string((char *)v->data, mc, buf); + vp = v->data; + norm_string((const char *)k->data, mc, buf); + dbv->rec = betoh32(vp->rec); + dbv->mask = betoh64(vp->mask); return(1); } @@ -443,14 +458,12 @@ single_search(struct rectree *tree, const struct opts struct mchars *mc, int vol) { int root, leaf, ch; - uint64_t mask; DBT key, val; DB *btree, *idx; char *buf; - recno_t rec; struct rec *rs; struct rec r; - struct db_val *vbuf; + struct db_val vb; root = -1; leaf = -1; @@ -470,20 +483,14 @@ single_search(struct rectree *tree, const struct opts } while (0 == (ch = (*btree->seq)(btree, &key, &val, R_NEXT))) { - if (key.size < 2 || sizeof(struct db_val) != val.size) + if ( ! btree_read(&key, &val, mc, &vb, &buf)) break; - if ( ! btree_read(&key, mc, &buf)) - break; - vbuf = val.data; - rec = vbuf->rec; - mask = vbuf->mask; - /* * See if this keyword record matches any of the * expressions we have stored. */ - if ( ! exprmark(expr, buf, mask, NULL)) + if ( ! exprmark(expr, buf, vb.mask, NULL)) continue; /* @@ -493,10 +500,10 @@ single_search(struct rectree *tree, const struct opts */ for (leaf = root; leaf >= 0; ) - if (rec > rs[leaf].res.rec && + if (vb.rec > rs[leaf].res.rec && rs[leaf].rhs >= 0) leaf = rs[leaf].rhs; - else if (rec < rs[leaf].res.rec && + else if (vb.rec < rs[leaf].res.rec && rs[leaf].lhs >= 0) leaf = rs[leaf].lhs; else @@ -508,9 +515,9 @@ single_search(struct rectree *tree, const struct opts * try to evaluate it now and continue anyway. */ - if (leaf >= 0 && rs[leaf].res.rec == rec) { + if (leaf >= 0 && rs[leaf].res.rec == vb.rec) { if (0 == rs[leaf].matched) - exprexec(expr, buf, mask, &rs[leaf]); + exprexec(expr, buf, vb.mask, &rs[leaf]); continue; } @@ -520,7 +527,7 @@ single_search(struct rectree *tree, const struct opts * database, then begin partial evaluation. */ - key.data = &rec; + key.data = &vb.rec; key.size = sizeof(recno_t); if (0 != (*idx->get)(idx, &key, &val, 0)) @@ -534,9 +541,11 @@ single_search(struct rectree *tree, const struct opts if (opts->cat && strcasecmp(opts->cat, r.res.cat)) continue; - if (opts->arch && strcasecmp(opts->arch, r.res.arch)) - continue; + if (opts->arch && *r.res.arch) + if (strcasecmp(opts->arch, r.res.arch)) + continue; + tree->node = rs = mandoc_realloc (rs, (tree->len + 1) * sizeof(struct rec)); @@ -544,12 +553,12 @@ single_search(struct rectree *tree, const struct opts rs[tree->len].matches = mandoc_calloc(terms, sizeof(int)); - exprexec(expr, buf, mask, &rs[tree->len]); + exprexec(expr, buf, vb.mask, &rs[tree->len]); /* Append to our tree. */ if (leaf >= 0) { - if (rec > rs[leaf].res.rec) + if (vb.rec > rs[leaf].res.rec) rs[leaf].rhs = tree->len; else rs[leaf].lhs = tree->len; @@ -571,6 +580,7 @@ static void recfree(struct rec *rec) { + free(rec->res.type); free(rec->res.file); free(rec->res.cat); free(rec->res.title); @@ -694,7 +704,6 @@ exprexpr(int argc, char *argv[], int *pos, int *lvl, s ++(*pos); ++(*lvl); next = mandoc_calloc(1, sizeof(struct expr)); - next->cs = 1; next->subexpr = exprexpr(argc, argv, pos, lvl, tt); if (NULL == next->subexpr) { free(next); @@ -745,8 +754,6 @@ exprterm(char *buf, int cs) memset(&e, 0, sizeof(struct expr)); - e.cs = cs; - /* Choose regex or substring match. */ if (NULL == (e.v = strpbrk(buf, "=~"))) { @@ -818,13 +825,8 @@ exprmark(const struct expr *p, const char *cp, if (p->regex) { if (regexec(&p->re, cp, 0, NULL, 0)) continue; - } else if (p->cs) { - if (NULL == strstr(cp, p->v)) - continue; - } else { - if (NULL == strcasestr(cp, p->v)) - continue; - } + } else if (NULL == strcasestr(cp, p->v)) + continue; if (NULL == ms) return(1);