version 1.26, 2014/04/09 21:50:08 |
version 1.34, 2014/04/20 16:46:05 |
|
|
#include "config.h" |
#include "config.h" |
#endif |
#endif |
|
|
|
#include <sys/mman.h> |
#include <assert.h> |
#include <assert.h> |
#include <fcntl.h> |
#include <fcntl.h> |
#include <getopt.h> |
#include <getopt.h> |
Line 63 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 */ |
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 open; /* opening parentheses before */ |
|
|
}; |
}; |
|
|
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 86 static char *buildoutput(sqlite3 *, sqlite3_stmt *, |
|
Line 87 static char *buildoutput(sqlite3 *, sqlite3_stmt *, |
|
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, |
static struct expr *exprspec(struct expr *, uint64_t, |
Line 100 static void sql_regexp(sqlite3_context *context, |
|
Line 101 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) |
|
{ |
|
static void *pagecache; |
|
int c; |
|
|
|
#define PC_PAGESIZE 1280 |
|
#define PC_NUMPAGES 256 |
|
|
|
if (start) { |
|
if (NULL != pagecache) { |
|
fprintf(stderr, "pagecache already enabled\n"); |
|
return((int)MANDOCLEVEL_BADARG); |
|
} |
|
|
|
pagecache = mmap(NULL, PC_PAGESIZE * PC_NUMPAGES, |
|
PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); |
|
|
|
if (MAP_FAILED == pagecache) { |
|
perror("mmap"); |
|
pagecache = NULL; |
|
return((int)MANDOCLEVEL_SYSERR); |
|
} |
|
|
|
c = sqlite3_config(SQLITE_CONFIG_PAGECACHE, |
|
pagecache, PC_PAGESIZE, PC_NUMPAGES); |
|
|
|
if (SQLITE_OK == c) |
|
return((int)MANDOCLEVEL_OK); |
|
|
|
fprintf(stderr, "pagecache: %s\n", sqlite3_errstr(c)); |
|
|
|
} else if (NULL == pagecache) { |
|
fprintf(stderr, "pagecache missing\n"); |
|
return((int)MANDOCLEVEL_BADARG); |
|
} |
|
|
|
if (-1 == munmap(pagecache, PC_PAGESIZE * PC_NUMPAGES)) { |
|
perror("munmap"); |
|
pagecache = NULL; |
|
return((int)MANDOCLEVEL_SYSERR); |
|
} |
|
|
|
pagecache = NULL; |
|
return((int)MANDOCLEVEL_OK); |
|
} |
|
|
|
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[], |
Line 108 mansearch(const struct mansearch *search, |
|
Line 157 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 127 mansearch(const struct mansearch *search, |
|
Line 176 mansearch(const struct mansearch *search, |
|
info.halloc = hash_halloc; |
info.halloc = hash_halloc; |
info.alloc = hash_alloc; |
info.alloc = hash_alloc; |
info.hfree = hash_free; |
info.hfree = 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 162 mansearch(const struct mansearch *search, |
|
Line 211 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 187 mansearch(const struct mansearch *search, |
|
Line 236 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 205 mansearch(const struct mansearch *search, |
|
Line 253 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 221 mansearch(const struct mansearch *search, |
|
Line 271 mansearch(const struct mansearch *search, |
|
SQL_BIND_BLOB(db, s, j, ep->regexp); |
SQL_BIND_BLOB(db, s, j, ep->regexp); |
} else |
} else |
SQL_BIND_TEXT(db, s, j, ep->substr); |
SQL_BIND_TEXT(db, s, j, ep->substr); |
if (0 == (TYPE_Nd & ep->bits)) |
if (0 == ((TYPE_Nd | TYPE_Nm) & ep->bits)) |
SQL_BIND_INT64(db, s, j, ep->bits); |
SQL_BIND_INT64(db, s, j, ep->bits); |
} |
} |
|
|
Line 237 mansearch(const struct mansearch *search, |
|
Line 287 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 259 mansearch(const struct mansearch *search, |
|
Line 309 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 * FROM mlinks WHERE pageid=?" |
" ORDER BY sec, arch, name", |
" ORDER BY sec, arch, name", |
-1, &s, NULL); |
-1, &s, NULL); |
Line 277 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_realloc(*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 299 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 320 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 402 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 411 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 504 sql_statement(const struct expr *e) |
|
Line 557 sql_statement(const struct expr *e) |
|
? (NULL == e->substr |
? (NULL == e->substr |
? "desc REGEXP ?" |
? "desc REGEXP ?" |
: "desc MATCH ?") |
: "desc MATCH ?") |
|
: TYPE_Nm == e->bits |
|
? (NULL == e->substr |
|
? "pageid IN (SELECT pageid FROM names " |
|
"WHERE name REGEXP ?)" |
|
: "pageid IN (SELECT pageid FROM names " |
|
"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 525 sql_statement(const struct expr *e) |
|
Line 584 sql_statement(const struct expr *e) |
|
static struct expr * |
static struct expr * |
exprcomp(const struct mansearch *search, int argc, char *argv[]) |
exprcomp(const struct mansearch *search, int argc, char *argv[]) |
{ |
{ |
|
uint64_t mask; |
int i, toopen, logic, igncase, toclose; |
int i, toopen, logic, igncase, toclose; |
struct expr *first, *next, *cur; |
struct expr *first, *prev, *cur, *next; |
|
|
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 569 exprcomp(const struct mansearch *search, int argc, cha |
|
Line 629 exprcomp(const struct mansearch *search, int argc, cha |
|
first = next; |
first = next; |
else |
else |
cur->next = next; |
cur->next = next; |
|
prev = cur = next; |
|
|
/* |
/* |
* Searching for descriptions must be split out |
* Searching for descriptions must be split out |
Line 576 exprcomp(const struct mansearch *search, int argc, cha |
|
Line 637 exprcomp(const struct mansearch *search, int argc, cha |
|
* not in the keys table. |
* not in the keys table. |
*/ |
*/ |
|
|
if (TYPE_Nd & next->bits && ~TYPE_Nd & next->bits) { |
for (mask = TYPE_Nm; mask <= TYPE_Nd; mask <<= 1) { |
cur = mandoc_calloc(1, sizeof(struct expr)); |
if (mask & cur->bits && ~mask & cur->bits) { |
memcpy(cur, next, sizeof(struct expr)); |
next = mandoc_calloc(1, |
next->open = 1; |
sizeof(struct expr)); |
next->bits = TYPE_Nd; |
memcpy(next, cur, sizeof(struct expr)); |
next->next = cur; |
prev->open = 1; |
cur->bits &= ~TYPE_Nd; |
cur->bits = mask; |
|
cur->next = next; |
|
cur = next; |
|
cur->bits &= ~mask; |
|
} |
|
} |
|
prev->and = (1 == logic); |
|
prev->open += toopen; |
|
if (cur != prev) |
cur->close = 1; |
cur->close = 1; |
} else |
|
cur = next; |
|
next->and = (1 == logic); |
|
next->open += toopen; |
|
toopen = logic = igncase = 0; |
toopen = logic = igncase = 0; |
} |
} |
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 612 exprspec(struct expr *cur, uint64_t key, const char *v |
|
Line 681 exprspec(struct expr *cur, uint64_t key, const char *v |
|
char errbuf[BUFSIZ]; |
char errbuf[BUFSIZ]; |
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)); |