-/* $Id: mansearch.c,v 1.6 2013/06/05 02:00:26 schwarze Exp $ */
+/* $Id: mansearch.c,v 1.10 2013/12/27 18:51:25 schwarze Exp $ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include <fcntl.h>
#include <getopt.h>
#include <limits.h>
+#include <regex.h>
#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
#include "mansearch.h"
#define SQL_BIND_TEXT(_db, _s, _i, _v) \
- if (SQLITE_OK != sqlite3_bind_text \
+ do { if (SQLITE_OK != sqlite3_bind_text \
((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \
- fprintf(stderr, "%s\n", sqlite3_errmsg((_db)))
+ fprintf(stderr, "%s\n", sqlite3_errmsg((_db))); \
+ } while (0)
#define SQL_BIND_INT64(_db, _s, _i, _v) \
- if (SQLITE_OK != sqlite3_bind_int64 \
+ do { if (SQLITE_OK != sqlite3_bind_int64 \
((_s), (_i)++, (_v))) \
- fprintf(stderr, "%s\n", sqlite3_errmsg((_db)))
+ fprintf(stderr, "%s\n", sqlite3_errmsg((_db))); \
+ } while (0)
+#define SQL_BIND_BLOB(_db, _s, _i, _v) \
+ do { if (SQLITE_OK != sqlite3_bind_blob \
+ ((_s), (_i)++, (&_v), sizeof(_v), SQLITE_STATIC)) \
+ fprintf(stderr, "%s\n", sqlite3_errmsg((_db))); \
+ } while (0)
struct expr {
- int glob; /* is glob? */
- uint64_t bits; /* type-mask */
- const char *v; /* search value */
- struct expr *next; /* next in sequence */
+ uint64_t bits; /* type-mask */
+ const char *substr; /* to search for, if applicable */
+ regex_t regexp; /* compiled regexp, if applicable */
+ struct expr *next; /* next in sequence */
};
struct match {
static struct expr *exprcomp(const struct mansearch *,
int, char *[]);
static void exprfree(struct expr *);
-static struct expr *exprterm(const struct mansearch *, char *);
+static struct expr *exprterm(const struct mansearch *, char *, int);
+static void sql_match(sqlite3_context *context,
+ int argc, sqlite3_value **argv);
+static void sql_regexp(sqlite3_context *context,
+ int argc, sqlite3_value **argv);
static char *sql_statement(const struct expr *,
const char *, const char *);
int fd, rc, c;
int64_t id;
char buf[PATH_MAX];
- char *sql;
+ char *sql, *newnames;
+ const char *oldnames, *sep1, *name, *sec, *sep2, *arch;
+ struct manpage *mpage;
struct expr *e, *ep;
sqlite3 *db;
sqlite3_stmt *s;
continue;
}
+ /*
+ * Define the SQL functions for substring
+ * and regular expression matching.
+ */
+
+ c = sqlite3_create_function(db, "match", 2,
+ SQLITE_ANY, NULL, sql_match, NULL, NULL);
+ assert(SQLITE_OK == c);
+ c = sqlite3_create_function(db, "regexp", 2,
+ SQLITE_ANY, NULL, sql_regexp, NULL, NULL);
+ assert(SQLITE_OK == c);
+
j = 1;
c = sqlite3_prepare_v2(db, sql, -1, &s, NULL);
if (SQLITE_OK != c)
SQL_BIND_TEXT(db, s, j, search->sec);
for (ep = e; NULL != ep; ep = ep->next) {
- SQL_BIND_TEXT(db, s, j, ep->v);
+ if (NULL == ep->substr) {
+ SQL_BIND_BLOB(db, s, j, ep->regexp);
+ } else
+ SQL_BIND_TEXT(db, s, j, ep->substr);
SQL_BIND_INT64(db, s, j, ep->bits);
}
fprintf(stderr, "%s\n", sqlite3_errmsg(db));
sqlite3_finalize(s);
- sqlite3_close(db);
+
+ c = sqlite3_prepare_v2(db,
+ "SELECT * FROM mlinks WHERE pageid=?",
+ -1, &s, NULL);
+ if (SQLITE_OK != c)
+ fprintf(stderr, "%s\n", sqlite3_errmsg(db));
for (mp = ohash_first(&htab, &idx);
NULL != mp;
*res = mandoc_realloc
(*res, maxres * sizeof(struct manpage));
}
- strlcpy((*res)[cur].file,
- 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;
+ mpage = *res + cur;
+ if (-1 == asprintf(&mpage->file, "%s/%s",
+ paths->paths[i], mp->file)) {
+ perror(0);
+ exit((int)MANDOCLEVEL_SYSERR);
+ }
+ mpage->names = NULL;
+ mpage->desc = mp->desc;
+ mpage->form = mp->form;
+
+ j = 1;
+ SQL_BIND_INT64(db, s, j, mp->id);
+ while (SQLITE_ROW == (c = sqlite3_step(s))) {
+ if (NULL == mpage->names) {
+ oldnames = "";
+ sep1 = "";
+ } else {
+ oldnames = mpage->names;
+ sep1 = ", ";
+ }
+ sec = sqlite3_column_text(s, 1);
+ arch = sqlite3_column_text(s, 2);
+ name = sqlite3_column_text(s, 3);
+ sep2 = '\0' == *arch ? "" : "/";
+ if (-1 == asprintf(&newnames,
+ "%s%s%s(%s%s%s)", oldnames, sep1,
+ name, sec, sep2, arch)) {
+ perror(0);
+ exit((int)MANDOCLEVEL_SYSERR);
+ }
+ free(mpage->names);
+ mpage->names = newnames;
+ }
+ if (SQLITE_DONE != c)
+ fprintf(stderr, "%s\n", sqlite3_errmsg(db));
+ sqlite3_reset(s);
+
free(mp->file);
free(mp);
cur++;
}
+
+ sqlite3_finalize(s);
+ sqlite3_close(db);
ohash_delete(&htab);
}
rc = 1;
return(rc);
}
+/*
+ * 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])));
+}
+
+/*
+ * Implement regular expression match
+ * as an application-defined SQL function.
+ */
+static void
+sql_regexp(sqlite3_context *context, int argc, sqlite3_value **argv)
+{
+
+ assert(2 == argc);
+ sqlite3_result_int(context, !regexec(
+ (regex_t *)sqlite3_value_blob(argv[0]),
+ (const char *)sqlite3_value_text(argv[1]),
+ 0, NULL, 0));
+}
+
/*
* Prepare the search SQL statement.
* We search for any of the words specified in our match expression.
sql_statement(const struct expr *e, const char *arch, const char *sec)
{
char *sql;
- const char *glob = "(key GLOB ? AND bits & ?)";
- const char *eq = "(key = ? AND bits & ?)";
+ 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 globsz;
- size_t eqsz;
+ size_t substrsz;
+ size_t regexpsz;
size_t sz;
sql = mandoc_strdup
- ("SELECT docid,bits,key,file,desc,form,sec,arch "
+ ("SELECT pageid,bits,key,file,desc,form,sec,arch "
"FROM keys "
- "INNER JOIN docs ON docs.id=keys.docid "
+ "INNER JOIN mpages ON mpages.id=keys.pageid "
"WHERE ");
sz = strlen(sql);
- globsz = strlen(glob);
- eqsz = strlen(eq);
+ substrsz = strlen(substr);
+ regexpsz = strlen(regexp);
if (NULL != arch) {
sz += strlen(andarch) + 1;
strlcat(sql, "(", sz);
for ( ; NULL != e; e = e->next) {
- sz += (e->glob ? globsz : eqsz) +
+ sz += (NULL == e->substr ? regexpsz : substrsz) +
(NULL == e->next ? 3 : 5);
sql = mandoc_realloc(sql, sz);
- strlcat(sql, e->glob ? glob : eq, sz);
+ strlcat(sql, NULL == e->substr ? regexp : substr, sz);
strlcat(sql, NULL == e->next ? ");" : " OR ", sz);
}
static struct expr *
exprcomp(const struct mansearch *search, int argc, char *argv[])
{
- int i;
+ int i, cs;
struct expr *first, *next, *cur;
first = cur = NULL;
for (i = 0; i < argc; i++) {
- next = exprterm(search, argv[i]);
+ if (0 == strcmp("-i", argv[i])) {
+ if (++i >= argc)
+ return(NULL);
+ cs = 0;
+ } else
+ cs = 1;
+ next = exprterm(search, argv[i], cs);
if (NULL == next) {
exprfree(first);
return(NULL);
}
static struct expr *
-exprterm(const struct mansearch *search, char *buf)
+exprterm(const struct mansearch *search, char *buf, int cs)
{
struct expr *e;
char *key, *v;
/*"whatis" mode uses an opaque string and default fields. */
if (MANSEARCH_WHATIS & search->flags) {
- e->v = buf;
+ e->substr = buf;
e->bits = search->deftype;
return(e);
}
*/
if (NULL == (v = strpbrk(buf, "=~"))) {
- e->v = buf;
+ e->substr = buf;
e->bits = search->deftype;
return(e);
} else if (v == buf)
e->bits = search->deftype;
- e->glob = '~' == *v;
- *v++ = '\0';
- e->v = v;
+ if ('~' == *v++) {
+ if (regcomp(&e->regexp, v,
+ REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE))) {
+ free(e);
+ return(NULL);
+ }
+ } else
+ e->substr = v;
+ v[-1] = '\0';
/*
* Parse out all possible fields.
git.ckatri.com / mandoc.git / blobdiff