=================================================================== RCS file: /cvs/mandoc/mansearch.c,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- mandoc/mansearch.c 2012/06/08 14:14:30 1.2 +++ mandoc/mansearch.c 2013/10/19 20:43:13 1.7 @@ -1,6 +1,7 @@ -/* $Id: mansearch.c,v 1.2 2012/06/08 14:14:30 kristaps Exp $ */ +/* $Id: mansearch.c,v 1.7 2013/10/19 20:43:13 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons + * Copyright (c) 2013 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,11 +19,10 @@ #include "config.h" #endif -#include - #include #include #include +#include #include #include #include @@ -30,19 +30,22 @@ #include #include +#ifdef HAVE_OHASH #include +#else +#include "compat_ohash.h" +#endif #include #include "mandoc.h" #include "manpath.h" -#include "mandocdb.h" #include "mansearch.h" -#define BIND_TEXT(_db, _s, _i, _v) \ +#define SQL_BIND_TEXT(_db, _s, _i, _v) \ if (SQLITE_OK != sqlite3_bind_text \ ((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \ fprintf(stderr, "%s\n", sqlite3_errmsg((_db))) -#define BIND_INT64(_db, _s, _i, _v) \ +#define SQL_BIND_INT64(_db, _s, _i, _v) \ if (SQLITE_OK != sqlite3_bind_int64 \ ((_s), (_i)++, (_v))) \ fprintf(stderr, "%s\n", sqlite3_errmsg((_db))) @@ -113,21 +116,24 @@ static const struct type types[] = { static void *hash_alloc(size_t, void *); static void hash_free(void *, size_t, void *); static void *hash_halloc(size_t, void *); -static struct expr *exprcomp(int, char *[]); +static struct expr *exprcomp(const struct mansearch *, + int, char *[]); static void exprfree(struct expr *); -static struct expr *exprterm(char *); +static struct expr *exprterm(const struct mansearch *, char *); +static void sql_match(sqlite3_context *context, + int argc, sqlite3_value **argv); static char *sql_statement(const struct expr *, const char *, const char *); int -mansearch(const struct manpaths *paths, - const char *arch, const char *sec, +mansearch(const struct mansearch *search, + const struct manpaths *paths, int argc, char *argv[], struct manpage **res, size_t *sz) { int fd, rc, c; int64_t id; - char buf[MAXPATHLEN]; + char buf[PATH_MAX]; char *sql; struct expr *e, *ep; sqlite3 *db; @@ -154,7 +160,7 @@ mansearch(const struct manpaths *paths, if (0 == argc) goto out; - if (NULL == (e = exprcomp(argc, argv))) + if (NULL == (e = exprcomp(search, argc, argv))) goto out; /* @@ -164,7 +170,7 @@ mansearch(const struct manpaths *paths, * on our current directory from which to start the chdir(). */ - if (NULL == getcwd(buf, MAXPATHLEN)) { + if (NULL == getcwd(buf, PATH_MAX)) { perror(NULL); goto out; } else if (-1 == (fd = open(buf, O_RDONLY, 0))) { @@ -172,7 +178,7 @@ mansearch(const struct manpaths *paths, goto out; } - sql = sql_statement(e, arch, sec); + sql = sql_statement(e, search->arch, search->sec); /* * Loop over the directories (containing databases) for us to @@ -202,19 +208,28 @@ mansearch(const struct manpaths *paths, continue; } + /* Define the SQL function for substring matching. */ + + c = sqlite3_create_function(db, "match", 2, + SQLITE_ANY, NULL, sql_match, NULL, NULL); + if (SQLITE_OK != c) { + fprintf(stderr, "%s\n", sqlite3_errmsg(db)); + break; + } + j = 1; c = sqlite3_prepare_v2(db, sql, -1, &s, NULL); if (SQLITE_OK != c) fprintf(stderr, "%s\n", sqlite3_errmsg(db)); - if (NULL != arch) - BIND_TEXT(db, s, j, arch); - if (NULL != sec) - BIND_TEXT(db, s, j, arch); + if (NULL != search->arch) + SQL_BIND_TEXT(db, s, j, search->arch); + if (NULL != search->sec) + SQL_BIND_TEXT(db, s, j, search->sec); for (ep = e; NULL != ep; ep = ep->next) { - BIND_TEXT(db, s, j, ep->v); - BIND_INT64(db, s, j, ep->bits); + SQL_BIND_TEXT(db, s, j, ep->v); + SQL_BIND_INT64(db, s, j, ep->bits); } memset(&htab, 0, sizeof(struct ohash)); @@ -262,9 +277,9 @@ mansearch(const struct manpaths *paths, (*res, maxres * sizeof(struct manpage)); } strlcpy((*res)[cur].file, - paths->paths[i], MAXPATHLEN); - strlcat((*res)[cur].file, "/", MAXPATHLEN); - strlcat((*res)[cur].file, mp->file, MAXPATHLEN); + paths->paths[i], PATH_MAX); + strlcat((*res)[cur].file, "/", PATH_MAX); + strlcat((*res)[cur].file, mp->file, PATH_MAX); (*res)[cur].desc = mp->desc; (*res)[cur].form = mp->form; free(mp->file); @@ -284,6 +299,22 @@ out: } /* + * Implement substring match as an application-defined SQL function. + * Using the SQL LIKE or GLOB operators instead would be a bad idea + * because that would require escaping metacharacters in the string + * being searched for. + */ +static void +sql_match(sqlite3_context *context, int argc, sqlite3_value **argv) +{ + + assert(2 == argc); + sqlite3_result_int(context, NULL != strcasestr( + (const char *)sqlite3_value_text(argv[1]), + (const char *)sqlite3_value_text(argv[0]))); +} + +/* * Prepare the search SQL statement. * We search for any of the words specified in our match expression. * We filter the per-doc AND expressions when collecting results. @@ -292,12 +323,12 @@ static char * sql_statement(const struct expr *e, const char *arch, const char *sec) { char *sql; + const char *substr = "(key MATCH ? AND bits & ?)"; const char *glob = "(key GLOB ? AND bits & ?)"; - const char *eq = "(key = ? AND bits & ?)"; const char *andarch = "arch = ? AND "; const char *andsec = "sec = ? AND "; + size_t substrsz; size_t globsz; - size_t eqsz; size_t sz; sql = mandoc_strdup @@ -306,8 +337,8 @@ sql_statement(const struct expr *e, const char *arch, "INNER JOIN docs ON docs.id=keys.docid " "WHERE "); sz = strlen(sql); + substrsz = strlen(substr); globsz = strlen(glob); - eqsz = strlen(eq); if (NULL != arch) { sz += strlen(andarch) + 1; @@ -326,10 +357,10 @@ sql_statement(const struct expr *e, const char *arch, strlcat(sql, "(", sz); for ( ; NULL != e; e = e->next) { - sz += (e->glob ? globsz : eqsz) + + sz += (e->glob ? globsz : substrsz) + (NULL == e->next ? 3 : 5); sql = mandoc_realloc(sql, sz); - strlcat(sql, e->glob ? glob : eq, sz); + strlcat(sql, e->glob ? glob : substr, sz); strlcat(sql, NULL == e->next ? ");" : " OR ", sz); } @@ -342,7 +373,7 @@ sql_statement(const struct expr *e, const char *arch, * "(", "foo=bar", etc.). */ static struct expr * -exprcomp(int argc, char *argv[]) +exprcomp(const struct mansearch *search, int argc, char *argv[]) { int i; struct expr *first, *next, *cur; @@ -350,7 +381,7 @@ exprcomp(int argc, char *argv[]) first = cur = NULL; for (i = 0; i < argc; i++) { - next = exprterm(argv[i]); + next = exprterm(search, argv[i]); if (NULL == next) { exprfree(first); return(NULL); @@ -366,7 +397,7 @@ exprcomp(int argc, char *argv[]) } static struct expr * -exprterm(char *buf) +exprterm(const struct mansearch *search, char *buf) { struct expr *e; char *key, *v; @@ -377,6 +408,14 @@ exprterm(char *buf) e = mandoc_calloc(1, sizeof(struct expr)); + /*"whatis" mode uses an opaque string and default fields. */ + + if (MANSEARCH_WHATIS & search->flags) { + e->v = buf; + e->bits = search->deftype; + return(e); + } + /* * If no =~ is specified, search with equality over names and * descriptions. @@ -385,10 +424,10 @@ exprterm(char *buf) if (NULL == (v = strpbrk(buf, "=~"))) { e->v = buf; - e->bits = TYPE_Nm | TYPE_Nd; + e->bits = search->deftype; return(e); } else if (v == buf) - e->bits = TYPE_Nm | TYPE_Nd; + e->bits = search->deftype; e->glob = '~' == *v; *v++ = '\0';