version 1.11, 2013/12/31 02:42:29 |
version 1.16, 2014/01/05 03:25:51 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
uint64_t bits; /* type-mask */ |
uint64_t bits; /* type-mask */ |
const char *substr; /* to search for, if applicable */ |
const char *substr; /* to search for, if applicable */ |
regex_t regexp; /* compiled regexp, if applicable */ |
regex_t regexp; /* compiled regexp, if applicable */ |
|
int open; /* opening parentheses before */ |
|
int and; /* logical AND before */ |
|
int close; /* closing parentheses after */ |
struct expr *next; /* next in sequence */ |
struct expr *next; /* next in sequence */ |
}; |
}; |
|
|
Line 117 static const struct type types[] = { |
|
Line 120 static const struct type types[] = { |
|
{ TYPE_Va, "Va" }, |
{ TYPE_Va, "Va" }, |
{ TYPE_Va, "Vt" }, |
{ TYPE_Va, "Vt" }, |
{ TYPE_Xr, "Xr" }, |
{ TYPE_Xr, "Xr" }, |
|
{ TYPE_sec, "sec" }, |
|
{ TYPE_arch,"arch" }, |
{ ~0ULL, "any" }, |
{ ~0ULL, "any" }, |
{ 0ULL, NULL } |
{ 0ULL, NULL } |
}; |
}; |
|
|
static char *buildnames(sqlite3 *, sqlite3_stmt *, uint64_t); |
static char *buildnames(sqlite3 *, sqlite3_stmt *, uint64_t); |
|
static char *buildoutput(sqlite3 *, sqlite3_stmt *, |
|
uint64_t, uint64_t); |
static void *hash_alloc(size_t, void *); |
static void *hash_alloc(size_t, void *); |
static void hash_free(void *, size_t, void *); |
static void hash_free(void *, size_t, void *); |
static void *hash_halloc(size_t, void *); |
static void *hash_halloc(size_t, void *); |
static struct expr *exprcomp(const struct mansearch *, |
static struct expr *exprcomp(const struct mansearch *, |
int, char *[]); |
int, char *[]); |
static void exprfree(struct expr *); |
static void exprfree(struct expr *); |
|
static struct expr *exprspec(struct expr *, uint64_t, |
|
const char *, const char *); |
static struct expr *exprterm(const struct mansearch *, char *, int); |
static struct expr *exprterm(const struct mansearch *, char *, int); |
|
static void sql_append(char **sql, size_t *sz, |
|
const char *newstr, int count); |
static void sql_match(sqlite3_context *context, |
static void sql_match(sqlite3_context *context, |
int argc, sqlite3_value **argv); |
int argc, sqlite3_value **argv); |
static void sql_regexp(sqlite3_context *context, |
static void sql_regexp(sqlite3_context *context, |
int argc, sqlite3_value **argv); |
int argc, sqlite3_value **argv); |
static char *sql_statement(const struct expr *, |
static char *sql_statement(const struct expr *); |
const char *, const char *); |
|
|
|
int |
int |
mansearch(const struct mansearch *search, |
mansearch(const struct mansearch *search, |
const struct manpaths *paths, |
const struct manpaths *paths, |
int argc, char *argv[], |
int argc, char *argv[], |
|
const char *outkey, |
struct manpage **res, size_t *sz) |
struct manpage **res, size_t *sz) |
{ |
{ |
int fd, rc, c; |
int fd, rc, c, ibit; |
int64_t id; |
int64_t id; |
|
uint64_t outbit; |
char buf[PATH_MAX]; |
char buf[PATH_MAX]; |
char *sql; |
char *sql; |
struct manpage *mpage; |
struct manpage *mpage; |
struct expr *e, *ep; |
struct expr *e, *ep; |
sqlite3 *db; |
sqlite3 *db; |
sqlite3_stmt *s; |
sqlite3_stmt *s, *s2; |
struct match *mp; |
struct match *mp; |
struct ohash_info info; |
struct ohash_info info; |
struct ohash htab; |
struct ohash htab; |
Line 175 mansearch(const struct mansearch *search, |
|
Line 187 mansearch(const struct mansearch *search, |
|
if (NULL == (e = exprcomp(search, argc, argv))) |
if (NULL == (e = exprcomp(search, argc, argv))) |
goto out; |
goto out; |
|
|
|
outbit = 0; |
|
if (NULL != outkey) { |
|
for (ibit = 0; types[ibit].bits; ibit++) { |
|
if (0 == strcasecmp(types[ibit].name, outkey)) { |
|
outbit = types[ibit].bits; |
|
break; |
|
} |
|
} |
|
} |
|
|
/* |
/* |
* Save a descriptor to the current working directory. |
* Save a descriptor to the current working directory. |
* Since pathnames in the "paths" variable might be relative, |
* Since pathnames in the "paths" variable might be relative, |
Line 190 mansearch(const struct mansearch *search, |
|
Line 212 mansearch(const struct mansearch *search, |
|
goto out; |
goto out; |
} |
} |
|
|
sql = sql_statement(e, search->arch, search->sec); |
sql = sql_statement(e); |
|
|
/* |
/* |
* Loop over the directories (containing databases) for us to |
* Loop over the directories (containing databases) for us to |
Line 237 mansearch(const struct mansearch *search, |
|
Line 259 mansearch(const struct mansearch *search, |
|
if (SQLITE_OK != c) |
if (SQLITE_OK != c) |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
|
|
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) { |
for (ep = e; NULL != ep; ep = ep->next) { |
if (NULL == ep->substr) { |
if (NULL == ep->substr) { |
SQL_BIND_BLOB(db, s, j, ep->regexp); |
SQL_BIND_BLOB(db, s, j, ep->regexp); |
Line 262 mansearch(const struct mansearch *search, |
|
Line 279 mansearch(const struct mansearch *search, |
|
* distribution of buckets in the table. |
* distribution of buckets in the table. |
*/ |
*/ |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
id = sqlite3_column_int64(s, 0); |
id = sqlite3_column_int64(s, 3); |
idx = ohash_lookup_memory |
idx = ohash_lookup_memory |
(&htab, (char *)&id, |
(&htab, (char *)&id, |
sizeof(uint64_t), (uint32_t)id); |
sizeof(uint64_t), (uint32_t)id); |
Line 273 mansearch(const struct mansearch *search, |
|
Line 290 mansearch(const struct mansearch *search, |
|
mp = mandoc_calloc(1, sizeof(struct match)); |
mp = mandoc_calloc(1, sizeof(struct match)); |
mp->id = id; |
mp->id = id; |
mp->file = mandoc_strdup |
mp->file = mandoc_strdup |
((char *)sqlite3_column_text(s, 3)); |
((char *)sqlite3_column_text(s, 0)); |
mp->desc = mandoc_strdup |
mp->desc = mandoc_strdup |
((char *)sqlite3_column_text(s, 4)); |
((char *)sqlite3_column_text(s, 1)); |
mp->form = sqlite3_column_int(s, 5); |
mp->form = sqlite3_column_int(s, 2); |
ohash_insert(&htab, idx, mp); |
ohash_insert(&htab, idx, mp); |
} |
} |
|
|
Line 291 mansearch(const struct mansearch *search, |
|
Line 308 mansearch(const struct mansearch *search, |
|
if (SQLITE_OK != c) |
if (SQLITE_OK != c) |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
|
|
|
c = sqlite3_prepare_v2(db, |
|
"SELECT * FROM keys WHERE pageid=? AND bits & ?", |
|
-1, &s2, NULL); |
|
if (SQLITE_OK != c) |
|
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
|
|
for (mp = ohash_first(&htab, &idx); |
for (mp = ohash_first(&htab, &idx); |
NULL != mp; |
NULL != mp; |
mp = ohash_next(&htab, &idx)) { |
mp = ohash_next(&htab, &idx)) { |
Line 308 mansearch(const struct mansearch *search, |
|
Line 331 mansearch(const struct mansearch *search, |
|
mpage->desc = mp->desc; |
mpage->desc = mp->desc; |
mpage->form = mp->form; |
mpage->form = mp->form; |
mpage->names = buildnames(db, s, mp->id); |
mpage->names = buildnames(db, s, mp->id); |
|
mpage->output = outbit ? |
|
buildoutput(db, s2, mp->id, outbit) : NULL; |
|
|
free(mp->file); |
free(mp->file); |
free(mp); |
free(mp); |
Line 315 mansearch(const struct mansearch *search, |
|
Line 340 mansearch(const struct mansearch *search, |
|
} |
} |
|
|
sqlite3_finalize(s); |
sqlite3_finalize(s); |
|
sqlite3_finalize(s2); |
sqlite3_close(db); |
sqlite3_close(db); |
ohash_delete(&htab); |
ohash_delete(&htab); |
} |
} |
Line 365 buildnames(sqlite3 *db, sqlite3_stmt *s, uint64_t id) |
|
Line 391 buildnames(sqlite3 *db, sqlite3_stmt *s, uint64_t id) |
|
return(names); |
return(names); |
} |
} |
|
|
|
static char * |
|
buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, uint64_t outbit) |
|
{ |
|
char *output, *newoutput; |
|
const char *oldoutput, *sep1, *data; |
|
size_t i; |
|
int c; |
|
|
|
output = NULL; |
|
i = 1; |
|
SQL_BIND_INT64(db, s, i, id); |
|
SQL_BIND_INT64(db, s, i, outbit); |
|
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
|
if (NULL == output) { |
|
oldoutput = ""; |
|
sep1 = ""; |
|
} else { |
|
oldoutput = output; |
|
sep1 = " # "; |
|
} |
|
data = sqlite3_column_text(s, 1); |
|
if (-1 == asprintf(&newoutput, "%s%s%s", |
|
oldoutput, sep1, data)) { |
|
perror(0); |
|
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
|
free(output); |
|
output = newoutput; |
|
} |
|
if (SQLITE_DONE != c) |
|
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
|
sqlite3_reset(s); |
|
return(output); |
|
} |
|
|
/* |
/* |
* Implement substring match as an application-defined SQL function. |
* Implement substring match as an application-defined SQL function. |
* Using the SQL LIKE or GLOB operators instead would be a bad idea |
* Using the SQL LIKE or GLOB operators instead would be a bad idea |
Line 396 sql_regexp(sqlite3_context *context, int argc, sqlite3 |
|
Line 457 sql_regexp(sqlite3_context *context, int argc, sqlite3 |
|
0, NULL, 0)); |
0, NULL, 0)); |
} |
} |
|
|
|
static void |
|
sql_append(char **sql, size_t *sz, const char *newstr, int count) |
|
{ |
|
size_t newsz; |
|
|
|
newsz = 1 < count ? (size_t)count : strlen(newstr); |
|
*sql = mandoc_realloc(*sql, *sz + newsz + 1); |
|
if (1 < count) |
|
memset(*sql + *sz, *newstr, (size_t)count); |
|
else |
|
memcpy(*sql + *sz, newstr, newsz); |
|
*sz += newsz; |
|
(*sql)[*sz] = '\0'; |
|
} |
|
|
/* |
/* |
* Prepare the search SQL statement. |
* 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. |
|
*/ |
*/ |
static char * |
static char * |
sql_statement(const struct expr *e, const char *arch, const char *sec) |
sql_statement(const struct expr *e) |
{ |
{ |
char *sql; |
char *sql; |
const char *substr = "(key MATCH ? AND bits & ?)"; |
|
const char *regexp = "(key REGEXP ? AND bits & ?)"; |
|
const char *andarch = "arch = ? AND "; |
|
const char *andsec = "sec = ? AND "; |
|
size_t substrsz; |
|
size_t regexpsz; |
|
size_t sz; |
size_t sz; |
|
int needop; |
|
|
sql = mandoc_strdup |
sql = mandoc_strdup("SELECT * FROM mpages WHERE "); |
("SELECT pageid,bits,key,file,desc,form,sec,arch " |
|
"FROM keys " |
|
"INNER JOIN mpages ON mpages.id=keys.pageid " |
|
"WHERE "); |
|
sz = strlen(sql); |
sz = strlen(sql); |
substrsz = strlen(substr); |
|
regexpsz = strlen(regexp); |
|
|
|
if (NULL != arch) { |
for (needop = 0; NULL != e; e = e->next) { |
sz += strlen(andarch) + 1; |
if (e->and) |
sql = mandoc_realloc(sql, sz); |
sql_append(&sql, &sz, " AND ", 1); |
strlcat(sql, andarch, sz); |
else if (needop) |
|
sql_append(&sql, &sz, " OR ", 1); |
|
if (e->open) |
|
sql_append(&sql, &sz, "(", e->open); |
|
sql_append(&sql, &sz, NULL == e->substr ? |
|
"id IN (SELECT pageid FROM keys " |
|
"WHERE key REGEXP ? AND bits & ?)" : |
|
"id IN (SELECT pageid FROM keys " |
|
"WHERE key MATCH ? AND bits & ?)", 1); |
|
if (e->close) |
|
sql_append(&sql, &sz, ")", e->close); |
|
needop = 1; |
} |
} |
|
|
if (NULL != sec) { |
|
sz += strlen(andsec) + 1; |
|
sql = mandoc_realloc(sql, sz); |
|
strlcat(sql, andsec, sz); |
|
} |
|
|
|
sz += 2; |
|
sql = mandoc_realloc(sql, sz); |
|
strlcat(sql, "(", sz); |
|
|
|
for ( ; NULL != e; e = e->next) { |
|
sz += (NULL == e->substr ? regexpsz : substrsz) + |
|
(NULL == e->next ? 3 : 5); |
|
sql = mandoc_realloc(sql, sz); |
|
strlcat(sql, NULL == e->substr ? regexp : substr, sz); |
|
strlcat(sql, NULL == e->next ? ");" : " OR ", sz); |
|
} |
|
|
|
return(sql); |
return(sql); |
} |
} |
|
|
Line 457 sql_statement(const struct expr *e, const char *arch, |
|
Line 513 sql_statement(const struct expr *e, const char *arch, |
|
static struct expr * |
static struct expr * |
exprcomp(const struct mansearch *search, int argc, char *argv[]) |
exprcomp(const struct mansearch *search, int argc, char *argv[]) |
{ |
{ |
int i, cs; |
int i, toopen, logic, igncase, toclose; |
struct expr *first, *next, *cur; |
struct expr *first, *next, *cur; |
|
|
first = cur = NULL; |
first = cur = NULL; |
|
logic = igncase = toclose = 0; |
|
toopen = 1; |
|
|
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
if (0 == strcmp("-i", argv[i])) { |
if (0 == strcmp("(", argv[i])) { |
if (++i >= argc) |
if (igncase) |
return(NULL); |
goto fail; |
cs = 0; |
toopen++; |
} else |
toclose++; |
cs = 1; |
continue; |
next = exprterm(search, argv[i], cs); |
} else if (0 == strcmp(")", argv[i])) { |
if (NULL == next) { |
if (toopen || logic || igncase || NULL == cur) |
exprfree(first); |
goto fail; |
return(NULL); |
cur->close++; |
|
if (0 > --toclose) |
|
goto fail; |
|
continue; |
|
} else if (0 == strcmp("-a", argv[i])) { |
|
if (toopen || logic || igncase || NULL == cur) |
|
goto fail; |
|
logic = 1; |
|
continue; |
|
} else if (0 == strcmp("-o", argv[i])) { |
|
if (toopen || logic || igncase || NULL == cur) |
|
goto fail; |
|
logic = 2; |
|
continue; |
|
} else if (0 == strcmp("-i", argv[i])) { |
|
if (igncase) |
|
goto fail; |
|
igncase = 1; |
|
continue; |
} |
} |
|
next = exprterm(search, argv[i], !igncase); |
|
if (NULL == next) |
|
goto fail; |
|
next->open = toopen; |
|
next->and = (1 == logic); |
if (NULL != first) { |
if (NULL != first) { |
cur->next = next; |
cur->next = next; |
cur = next; |
cur = next; |
} else |
} else |
cur = first = next; |
cur = first = next; |
|
toopen = logic = igncase = 0; |
} |
} |
|
if (toopen || logic || igncase || toclose) |
|
goto fail; |
|
|
|
cur->close++; |
|
cur = exprspec(cur, TYPE_arch, search->arch, "^(%s|any)$"); |
|
exprspec(cur, TYPE_sec, search->sec, "^%s$"); |
|
|
return(first); |
return(first); |
|
|
|
fail: |
|
if (NULL != first) |
|
exprfree(first); |
|
return(NULL); |
} |
} |
|
|
static struct expr * |
static struct expr * |
|
exprspec(struct expr *cur, uint64_t key, const char *value, |
|
const char *format) |
|
{ |
|
char errbuf[BUFSIZ]; |
|
char *cp; |
|
int irc; |
|
|
|
if (NULL == value) |
|
return(cur); |
|
|
|
if (-1 == asprintf(&cp, format, value)) { |
|
perror(0); |
|
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
|
cur->next = mandoc_calloc(1, sizeof(struct expr)); |
|
cur = cur->next; |
|
cur->and = 1; |
|
cur->bits = key; |
|
if (0 != (irc = regcomp(&cur->regexp, cp, |
|
REG_EXTENDED | REG_NOSUB | REG_ICASE))) { |
|
regerror(irc, &cur->regexp, errbuf, sizeof(errbuf)); |
|
fprintf(stderr, "regcomp: %s\n", errbuf); |
|
cur->substr = value; |
|
} |
|
free(cp); |
|
return(cur); |
|
} |
|
|
|
static struct expr * |
exprterm(const struct mansearch *search, char *buf, int cs) |
exprterm(const struct mansearch *search, char *buf, int cs) |
{ |
{ |
|
char errbuf[BUFSIZ]; |
struct expr *e; |
struct expr *e; |
char *key, *v; |
char *key, *v; |
size_t i; |
size_t i; |
|
int irc; |
|
|
if ('\0' == *buf) |
if ('\0' == *buf) |
return(NULL); |
return(NULL); |
Line 518 exprterm(const struct mansearch *search, char *buf, in |
|
Line 642 exprterm(const struct mansearch *search, char *buf, in |
|
e->bits = search->deftype; |
e->bits = search->deftype; |
|
|
if ('~' == *v++) { |
if ('~' == *v++) { |
if (regcomp(&e->regexp, v, |
if (0 != (irc = regcomp(&e->regexp, v, |
REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE))) { |
REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE)))) { |
|
regerror(irc, &e->regexp, errbuf, sizeof(errbuf)); |
|
fprintf(stderr, "regcomp: %s\n", errbuf); |
free(e); |
free(e); |
return(NULL); |
return(NULL); |
} |
} |