version 1.29, 2014/04/15 23:48:51 |
version 1.38, 2014/07/12 14:00:25 |
Line 64 extern const char *const mansearch_keynames[]; |
|
Line 64 extern const char *const mansearch_keynames[]; |
|
} while (0) |
} while (0) |
|
|
struct expr { |
struct expr { |
uint64_t bits; /* type-mask */ |
|
const char *substr; /* to search for, if applicable */ |
|
regex_t regexp; /* compiled regexp, if applicable */ |
regex_t regexp; /* compiled regexp, if applicable */ |
|
const char *substr; /* to search for, if applicable */ |
|
struct expr *next; /* next in sequence */ |
|
uint64_t bits; /* type-mask */ |
|
int equal; /* equality, not subsring match */ |
int open; /* opening parentheses before */ |
int open; /* opening parentheses before */ |
int and; /* logical AND before */ |
int and; /* logical AND before */ |
int close; /* closing parentheses after */ |
int close; /* closing parentheses after */ |
struct expr *next; /* next in sequence */ |
|
}; |
}; |
|
|
struct match { |
struct match { |
uint64_t id; /* identifier in database */ |
uint64_t pageid; /* identifier in database */ |
char *desc; /* manual page description */ |
char *desc; /* manual page description */ |
int form; /* 0 == catpage */ |
int form; /* 0 == catpage */ |
}; |
}; |
Line 85 static void buildnames(struct manpage *, sqlite3 *, |
|
Line 86 static void buildnames(struct manpage *, sqlite3 *, |
|
static char *buildoutput(sqlite3 *, sqlite3_stmt *, |
static char *buildoutput(sqlite3 *, sqlite3_stmt *, |
uint64_t, uint64_t); |
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 *, void *); |
static void *hash_halloc(size_t, void *); |
static void *hash_calloc(size_t, 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, |
static struct expr *exprspec(struct expr *, uint64_t, |
Line 101 static void sql_regexp(sqlite3_context *context, |
|
Line 102 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 *); |
|
|
|
|
int |
int |
mansearch_setup(int start) |
mansearch_setup(int start) |
{ |
{ |
Line 156 mansearch(const struct mansearch *search, |
|
Line 158 mansearch(const struct mansearch *search, |
|
struct manpage **res, size_t *sz) |
struct manpage **res, size_t *sz) |
{ |
{ |
int fd, rc, c, indexbit; |
int fd, rc, c, indexbit; |
int64_t id; |
int64_t pageid; |
uint64_t outbit, iterbit; |
uint64_t outbit, iterbit; |
char buf[PATH_MAX]; |
char buf[PATH_MAX]; |
char *sql; |
char *sql; |
Line 170 mansearch(const struct mansearch *search, |
|
Line 172 mansearch(const struct mansearch *search, |
|
unsigned int idx; |
unsigned int idx; |
size_t i, j, cur, maxres; |
size_t i, j, cur, maxres; |
|
|
memset(&info, 0, sizeof(struct ohash_info)); |
info.calloc = hash_calloc; |
|
|
info.halloc = hash_halloc; |
|
info.alloc = hash_alloc; |
info.alloc = hash_alloc; |
info.hfree = hash_free; |
info.free = hash_free; |
info.key_offset = offsetof(struct match, id); |
info.key_offset = offsetof(struct match, pageid); |
|
|
*sz = cur = maxres = 0; |
*sz = cur = maxres = 0; |
sql = NULL; |
sql = NULL; |
Line 210 mansearch(const struct mansearch *search, |
|
Line 210 mansearch(const struct mansearch *search, |
|
*/ |
*/ |
|
|
if (NULL == getcwd(buf, PATH_MAX)) { |
if (NULL == getcwd(buf, PATH_MAX)) { |
perror(NULL); |
perror("getcwd"); |
goto out; |
goto out; |
} else if (-1 == (fd = open(buf, O_RDONLY, 0))) { |
} else if (-1 == (fd = open(buf, O_RDONLY, 0))) { |
perror(buf); |
perror(buf); |
Line 218 mansearch(const struct mansearch *search, |
|
Line 218 mansearch(const struct mansearch *search, |
|
} |
} |
|
|
sql = sql_statement(e); |
sql = sql_statement(e); |
printf("%s\n", sql); |
|
|
|
/* |
/* |
* Loop over the directories (containing databases) for us to |
* Loop over the directories (containing databases) for us to |
Line 236 mansearch(const struct mansearch *search, |
|
Line 235 mansearch(const struct mansearch *search, |
|
} else if (-1 == chdir(paths->paths[i])) { |
} else if (-1 == chdir(paths->paths[i])) { |
perror(paths->paths[i]); |
perror(paths->paths[i]); |
continue; |
continue; |
} |
} |
|
|
c = sqlite3_open_v2 |
c = sqlite3_open_v2(MANDOC_DB, &db, |
(MANDOC_DB, &db, |
SQLITE_OPEN_READONLY, NULL); |
SQLITE_OPEN_READONLY, NULL); |
|
|
|
if (SQLITE_OK != c) { |
if (SQLITE_OK != c) { |
perror(MANDOC_DB); |
perror(MANDOC_DB); |
Line 254 mansearch(const struct mansearch *search, |
|
Line 252 mansearch(const struct mansearch *search, |
|
*/ |
*/ |
|
|
c = sqlite3_create_function(db, "match", 2, |
c = sqlite3_create_function(db, "match", 2, |
SQLITE_ANY, NULL, sql_match, NULL, NULL); |
SQLITE_UTF8 | SQLITE_DETERMINISTIC, |
|
NULL, sql_match, NULL, NULL); |
assert(SQLITE_OK == c); |
assert(SQLITE_OK == c); |
c = sqlite3_create_function(db, "regexp", 2, |
c = sqlite3_create_function(db, "regexp", 2, |
SQLITE_ANY, NULL, sql_regexp, NULL, NULL); |
SQLITE_UTF8 | SQLITE_DETERMINISTIC, |
|
NULL, sql_regexp, NULL, NULL); |
assert(SQLITE_OK == c); |
assert(SQLITE_OK == c); |
|
|
j = 1; |
j = 1; |
Line 286 mansearch(const struct mansearch *search, |
|
Line 286 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, 2); |
pageid = sqlite3_column_int64(s, 2); |
idx = ohash_lookup_memory |
idx = ohash_lookup_memory(&htab, |
(&htab, (char *)&id, |
(char *)&pageid, sizeof(uint64_t), |
sizeof(uint64_t), (uint32_t)id); |
(uint32_t)pageid); |
|
|
if (NULL != ohash_find(&htab, idx)) |
if (NULL != ohash_find(&htab, idx)) |
continue; |
continue; |
|
|
mp = mandoc_calloc(1, sizeof(struct match)); |
mp = mandoc_calloc(1, sizeof(struct match)); |
mp->id = id; |
mp->pageid = pageid; |
mp->form = sqlite3_column_int(s, 1); |
mp->form = sqlite3_column_int(s, 1); |
if (TYPE_Nd == outbit) |
if (TYPE_Nd == outbit) |
mp->desc = mandoc_strdup( |
mp->desc = mandoc_strdup( |
Line 308 mansearch(const struct mansearch *search, |
|
Line 308 mansearch(const struct mansearch *search, |
|
|
|
sqlite3_finalize(s); |
sqlite3_finalize(s); |
|
|
c = sqlite3_prepare_v2(db, |
c = sqlite3_prepare_v2(db, |
"SELECT * FROM mlinks WHERE pageid=?" |
"SELECT sec, arch, name, pageid FROM mlinks " |
" ORDER BY sec, arch, name", |
"WHERE pageid=? ORDER BY sec, arch, name", |
-1, &s, NULL); |
-1, &s, NULL); |
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, |
c = sqlite3_prepare_v2(db, |
"SELECT * FROM keys WHERE pageid=? AND bits & ?", |
"SELECT bits, key, pageid FROM keys " |
|
"WHERE pageid=? AND bits & ?", |
-1, &s2, NULL); |
-1, &s2, NULL); |
if (SQLITE_OK != c) |
if (SQLITE_OK != c) |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)); |
Line 326 mansearch(const struct mansearch *search, |
|
Line 327 mansearch(const struct mansearch *search, |
|
mp = ohash_next(&htab, &idx)) { |
mp = ohash_next(&htab, &idx)) { |
if (cur + 1 > maxres) { |
if (cur + 1 > maxres) { |
maxres += 1024; |
maxres += 1024; |
*res = mandoc_realloc |
*res = mandoc_reallocarray(*res, |
(*res, maxres * sizeof(struct manpage)); |
maxres, sizeof(struct manpage)); |
} |
} |
mpage = *res + cur; |
mpage = *res + cur; |
mpage->form = mp->form; |
mpage->form = mp->form; |
buildnames(mpage, db, s, mp->id, |
buildnames(mpage, db, s, mp->pageid, |
paths->paths[i], mp->form); |
paths->paths[i], mp->form); |
mpage->output = TYPE_Nd & outbit ? |
mpage->output = TYPE_Nd & outbit ? |
mp->desc : outbit ? |
mp->desc : outbit ? |
buildoutput(db, s2, mp->id, outbit) : NULL; |
buildoutput(db, s2, mp->pageid, outbit) : NULL; |
|
|
free(mp); |
free(mp); |
cur++; |
cur++; |
Line 348 mansearch(const struct mansearch *search, |
|
Line 349 mansearch(const struct mansearch *search, |
|
} |
} |
rc = 1; |
rc = 1; |
out: |
out: |
exprfree(e); |
if (-1 != fd) { |
if (-1 != fd) |
if (-1 == fchdir(fd)) |
|
perror(buf); |
close(fd); |
close(fd); |
|
} |
|
exprfree(e); |
free(sql); |
free(sql); |
*sz = cur; |
*sz = cur; |
return(rc); |
return(rc); |
|
|
|
|
static void |
static void |
buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s, |
buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s, |
uint64_t id, const char *path, int form) |
uint64_t pageid, const char *path, int form) |
{ |
{ |
char *newnames, *prevsec, *prevarch; |
char *newnames, *prevsec, *prevarch; |
const char *oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec; |
const char *oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec; |
Line 369 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3 |
|
Line 373 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3 |
|
mpage->names = NULL; |
mpage->names = NULL; |
prevsec = prevarch = NULL; |
prevsec = prevarch = NULL; |
i = 1; |
i = 1; |
SQL_BIND_INT64(db, s, i, id); |
SQL_BIND_INT64(db, s, i, pageid); |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
|
|
/* Decide whether we already have some names. */ |
/* Decide whether we already have some names. */ |
Line 451 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3 |
|
Line 455 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3 |
|
} |
} |
|
|
static char * |
static char * |
buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, uint64_t outbit) |
buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t pageid, uint64_t outbit) |
{ |
{ |
char *output, *newoutput; |
char *output, *newoutput; |
const char *oldoutput, *sep1, *data; |
const char *oldoutput, *sep1, *data; |
Line 460 buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, |
|
Line 464 buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, |
|
|
|
output = NULL; |
output = NULL; |
i = 1; |
i = 1; |
SQL_BIND_INT64(db, s, i, id); |
SQL_BIND_INT64(db, s, i, pageid); |
SQL_BIND_INT64(db, s, i, outbit); |
SQL_BIND_INT64(db, s, i, outbit); |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
if (NULL == output) { |
if (NULL == output) { |
Line 538 sql_statement(const struct expr *e) |
|
Line 542 sql_statement(const struct expr *e) |
|
size_t sz; |
size_t sz; |
int needop; |
int needop; |
|
|
sql = mandoc_strdup("SELECT * FROM mpages WHERE "); |
sql = mandoc_strdup( |
|
"SELECT desc, form, pageid FROM mpages WHERE "); |
sz = strlen(sql); |
sz = strlen(sql); |
|
|
for (needop = 0; NULL != e; e = e->next) { |
for (needop = 0; NULL != e; e = e->next) { |
Line 555 sql_statement(const struct expr *e) |
|
Line 560 sql_statement(const struct expr *e) |
|
: "desc MATCH ?") |
: "desc MATCH ?") |
: TYPE_Nm == e->bits |
: TYPE_Nm == e->bits |
? (NULL == e->substr |
? (NULL == e->substr |
? "id IN (SELECT pageid FROM names " |
? "pageid IN (SELECT pageid FROM names " |
"WHERE name REGEXP ?)" |
"WHERE name REGEXP ?)" |
: "id IN (SELECT pageid FROM names " |
: e->equal |
|
? "pageid IN (SELECT pageid FROM names " |
|
"WHERE name = ?)" |
|
: "pageid IN (SELECT pageid FROM names " |
"WHERE name MATCH ?)") |
"WHERE name MATCH ?)") |
: (NULL == e->substr |
: (NULL == e->substr |
? "id IN (SELECT pageid FROM keys " |
? "pageid IN (SELECT pageid FROM keys " |
"WHERE key REGEXP ? AND bits & ?)" |
"WHERE key REGEXP ? AND bits & ?)" |
: "id IN (SELECT pageid FROM keys " |
: "pageid IN (SELECT pageid FROM keys " |
"WHERE key MATCH ? AND bits & ?)"), 1); |
"WHERE key MATCH ? AND bits & ?)"), 1); |
if (e->close) |
if (e->close) |
sql_append(&sql, &sz, ")", e->close); |
sql_append(&sql, &sz, ")", e->close); |
Line 586 exprcomp(const struct mansearch *search, int argc, cha |
|
Line 594 exprcomp(const struct mansearch *search, int argc, cha |
|
|
|
first = cur = NULL; |
first = cur = NULL; |
logic = igncase = toclose = 0; |
logic = igncase = toclose = 0; |
toopen = 1; |
toopen = NULL != search->sec || NULL != search->arch; |
|
|
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
if (0 == strcmp("(", argv[i])) { |
if (0 == strcmp("(", argv[i])) { |
Line 655 exprcomp(const struct mansearch *search, int argc, cha |
|
Line 663 exprcomp(const struct mansearch *search, int argc, cha |
|
if (toopen || logic || igncase || toclose) |
if (toopen || logic || igncase || toclose) |
goto fail; |
goto fail; |
|
|
cur->close++; |
if (NULL != search->sec || NULL != search->arch) |
cur = exprspec(cur, TYPE_arch, search->arch, "^(%s|any)$"); |
cur->close++; |
exprspec(cur, TYPE_sec, search->sec, "^%s$"); |
if (NULL != search->arch) |
|
cur = exprspec(cur, TYPE_arch, search->arch, "^(%s|any)$"); |
|
if (NULL != search->sec) |
|
exprspec(cur, TYPE_sec, search->sec, "^%s$"); |
|
|
return(first); |
return(first); |
|
|
Line 675 exprspec(struct expr *cur, uint64_t key, const char *v |
|
Line 686 exprspec(struct expr *cur, uint64_t key, const char *v |
|
char *cp; |
char *cp; |
int irc; |
int irc; |
|
|
if (NULL == value) |
|
return(cur); |
|
|
|
mandoc_asprintf(&cp, format, value); |
mandoc_asprintf(&cp, format, value); |
cur->next = mandoc_calloc(1, sizeof(struct expr)); |
cur->next = mandoc_calloc(1, sizeof(struct expr)); |
cur = cur->next; |
cur = cur->next; |
Line 698 exprterm(const struct mansearch *search, char *buf, in |
|
Line 706 exprterm(const struct mansearch *search, char *buf, in |
|
{ |
{ |
char errbuf[BUFSIZ]; |
char errbuf[BUFSIZ]; |
struct expr *e; |
struct expr *e; |
char *key, *v; |
char *key, *val; |
uint64_t iterbit; |
uint64_t iterbit; |
int i, irc; |
int i, irc; |
|
|
Line 707 exprterm(const struct mansearch *search, char *buf, in |
|
Line 715 exprterm(const struct mansearch *search, char *buf, in |
|
|
|
e = mandoc_calloc(1, sizeof(struct expr)); |
e = mandoc_calloc(1, sizeof(struct expr)); |
|
|
/*"whatis" mode uses an opaque string and default fields. */ |
if (MANSEARCH_MAN & search->flags) { |
|
|
if (MANSEARCH_WHATIS & search->flags) { |
|
e->substr = buf; |
|
e->bits = search->deftype; |
e->bits = search->deftype; |
|
e->substr = buf; |
|
e->equal = 1; |
return(e); |
return(e); |
} |
} |
|
|
/* |
/* |
* If no =~ is specified, search with equality over names and |
* Look for an '=' or '~' operator, |
* descriptions. |
* unless forced to some fixed macro keys. |
* If =~ begins the phrase, use name and description fields. |
|
*/ |
*/ |
|
|
if (NULL == (v = strpbrk(buf, "=~"))) { |
if (MANSEARCH_WHATIS & search->flags) |
e->substr = buf; |
val = NULL; |
|
else |
|
val = strpbrk(buf, "=~"); |
|
|
|
if (NULL == val) { |
e->bits = search->deftype; |
e->bits = search->deftype; |
return(e); |
e->substr = buf; |
} else if (v == buf) |
|
e->bits = search->deftype; |
|
|
|
if ('~' == *v++) { |
/* |
|
* Found an operator. |
|
* Regexp search is requested by !e->substr. |
|
*/ |
|
|
|
} else { |
|
if (val == buf) |
|
e->bits = search->deftype; |
|
if ('=' == *val) |
|
e->substr = val + 1; |
|
*val++ = '\0'; |
if (NULL != strstr(buf, "arch")) |
if (NULL != strstr(buf, "arch")) |
cs = 0; |
cs = 0; |
if (0 != (irc = regcomp(&e->regexp, v, |
} |
REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE)))) { |
|
|
/* Compile regular expressions. */ |
|
|
|
if (MANSEARCH_WHATIS & search->flags) { |
|
e->substr = NULL; |
|
mandoc_asprintf(&val, "[[:<:]]%s[[:>:]]", buf); |
|
} |
|
|
|
if (NULL == e->substr) { |
|
irc = regcomp(&e->regexp, val, |
|
REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE)); |
|
if (MANSEARCH_WHATIS & search->flags) |
|
free(val); |
|
if (irc) { |
regerror(irc, &e->regexp, errbuf, sizeof(errbuf)); |
regerror(irc, &e->regexp, errbuf, sizeof(errbuf)); |
fprintf(stderr, "regcomp: %s\n", errbuf); |
fprintf(stderr, "regcomp: %s\n", errbuf); |
free(e); |
free(e); |
return(NULL); |
return(NULL); |
} |
} |
} else |
} |
e->substr = v; |
|
v[-1] = '\0'; |
|
|
|
|
if (e->bits) |
|
return(e); |
|
|
/* |
/* |
* Parse out all possible fields. |
* Parse out all possible fields. |
* If the field doesn't resolve, bail. |
* If the field doesn't resolve, bail. |
Line 784 exprfree(struct expr *p) |
|
Line 816 exprfree(struct expr *p) |
|
} |
} |
|
|
static void * |
static void * |
hash_halloc(size_t sz, void *arg) |
hash_calloc(size_t nmemb, size_t sz, void *arg) |
{ |
{ |
|
|
return(mandoc_calloc(sz, 1)); |
return(mandoc_calloc(nmemb, sz)); |
} |
} |
|
|
static void * |
static void * |
Line 798 hash_alloc(size_t sz, void *arg) |
|
Line 830 hash_alloc(size_t sz, void *arg) |
|
} |
} |
|
|
static void |
static void |
hash_free(void *p, size_t sz, void *arg) |
hash_free(void *p, void *arg) |
{ |
{ |
|
|
free(p); |
free(p); |