===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- mandoc/mansearch.c	2012/06/09 14:11:16	1.5
+++ mandoc/mansearch.c	2013/10/19 20:43:13	1.7
@@ -1,6 +1,7 @@
-/*	$Id: mansearch.c,v 1.5 2012/06/09 14:11:16 kristaps Exp $ */
+/*	$Id: mansearch.c,v 1.7 2013/10/19 20:43:13 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
@@ -18,11 +19,10 @@
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-
 #include <assert.h>
 #include <fcntl.h>
 #include <getopt.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -120,6 +120,8 @@ static	struct expr	*exprcomp(const struct mansearch *,
 				int, char *[]);
 static	void		 exprfree(struct expr *);
 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 *);
 
@@ -131,7 +133,7 @@ mansearch(const struct mansearch *search,
 {
 	int		 fd, rc, c;
 	int64_t		 id;
-	char		 buf[MAXPATHLEN];
+	char		 buf[PATH_MAX];
 	char		*sql;
 	struct expr	*e, *ep;
 	sqlite3		*db;
@@ -168,7 +170,7 @@ mansearch(const struct mansearch *search,
 	 * 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))) {
@@ -206,6 +208,15 @@ mansearch(const struct mansearch *search,
 			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)
@@ -266,9 +277,9 @@ mansearch(const struct mansearch *search,
 					(*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);
@@ -288,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.
@@ -296,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
@@ -310,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;
@@ -330,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);
 	}