X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plocate.cpp;h=de7bd7a0eafc1073b1bfdc72b53166f88d0535ea;hb=e5c002a3c4d820774bdbe037a337f3c5c349d8d1;hp=54d3c796ff82a3bb2630d6cba85e0de3b133141a;hpb=0637606799315a21802ff94bce448f55d82ccb9e;p=plocate

diff --git a/plocate.cpp b/plocate.cpp
index 54d3c79..de7bd7a 100644
--- a/plocate.cpp
+++ b/plocate.cpp
@@ -1,6 +1,7 @@
 #include "db.h"
 #include "io_uring_engine.h"
 #include "parse_trigrams.h"
+#include "turbopfor.h"
 #include "unique_sort.h"
 
 #include <algorithm>
@@ -39,13 +40,15 @@ using namespace std::chrono;
 		} \
 	} while (false)
 
-#include "turbopfor.h"
+#define DEFAULT_DBPATH "/var/lib/mlocate/plocate.db"
 
-const char *dbpath = "/var/lib/mlocate/plocate.db";
+const char *dbpath = DEFAULT_DBPATH;
 bool ignore_case = false;
 bool only_count = false;
 bool print_nul = false;
 bool use_debug = false;
+bool patterns_are_regex = false;
+bool use_extended_regex = false;
 int64_t limit_matches = numeric_limits<int64_t>::max();
 
 class Serializer {
@@ -95,7 +98,7 @@ void Serializer::release_current()
 
 struct Needle {
 	enum { STRSTR,
-	       REGEX,  // Not currently used.
+	       REGEX,
 	       GLOB } type;
 	string str;  // Filled in no matter what.
 	regex_t re;  // For REGEX.
@@ -399,11 +402,17 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
 	dprintf("Corpus init done after %.1f ms.\n", 1e3 * duration<float>(steady_clock::now() - start).count());
 
 	vector<TrigramDisjunction> trigram_groups;
-	for (const Needle &needle : needles) {
-		if (needle.str.size() < 3)
-			continue;
-		parse_trigrams(needle.str, ignore_case, &trigram_groups);
+	if (patterns_are_regex) {
+		// We could parse the regex to find trigrams that have to be there
+		// (there are actually known algorithms to deal with disjunctions
+		// and such, too), but for now, we just go brute force.
+		// Using locate with regexes is pretty niche.
+	} else {
+		for (const Needle &needle : needles) {
+			parse_trigrams(needle.str, ignore_case, &trigram_groups);
+		}
 	}
+
 	unique_sort(
 		&trigram_groups,
 		[](const TrigramDisjunction &a, const TrigramDisjunction &b) { return a.trigram_alternatives < b.trigram_alternatives; },
@@ -572,19 +581,41 @@ string unescape_glob_to_plain_string(const string &needle)
 	return unescaped;
 }
 
+regex_t compile_regex(const string &needle)
+{
+	regex_t re;
+	int flags = REG_NOSUB;
+	if (ignore_case) {
+		flags |= REG_ICASE;
+	}
+	if (use_extended_regex) {
+		flags |= REG_EXTENDED;
+	}
+	int err = regcomp(&re, needle.c_str(), flags);
+	if (err != 0) {
+		char errbuf[256];
+		regerror(err, &re, errbuf, sizeof(errbuf));
+		fprintf(stderr, "Error when compiling regex '%s': %s\n", needle.c_str(), errbuf);
+		exit(1);
+	}
+	return re;
+}
+
 void usage()
 {
-	// The help text comes from mlocate.
-	printf("Usage: plocate [OPTION]... PATTERN...\n");
-	printf("\n");
-	printf("  -c, --count            only print number of found entries\n");
-	printf("  -d, --database DBPATH  use DBPATH instead of default database (which is\n");
-	printf("                         %s)\n", dbpath);
-	printf("  -h, --help             print this help\n");
-	printf("  -i, --ignore-case      ignore case distinctions when matching patterns\n");
-	printf("  -l, --limit, -n LIMIT  limit output (or counting) to LIMIT entries\n");
-	printf("  -0, --null             separate entries with NUL on output\n");
-	printf("  -V, --version          print version information\n");
+	printf(
+		"Usage: plocate [OPTION]... PATTERN...\n"
+		"\n"
+		"  -c, --count            print number of matches instead of the matches\n"
+		"  -d, --database DBPATH  search for files in DBPATH\n"
+		"                         (default is " DEFAULT_DBPATH ")\n"
+		"  -i, --ignore-case      search case-insensitively\n"
+		"  -l, --limit LIMIT      stop after LIMIT matches\n"
+		"  -0, --null             delimit matches by NUL instead of newline\n"
+		"  -r, --regexp           interpret patterns as basic regexps (slow)\n"
+		"      --regex            interpret patterns as extended regexps (slow)\n"
+		"      --help             print this help\n"
+		"      --version          print version information\n");
 }
 
 void version()
@@ -599,6 +630,7 @@ void version()
 
 int main(int argc, char **argv)
 {
+	constexpr int EXTENDED_REGEX = 1000;
 	static const struct option long_options[] = {
 		{ "help", no_argument, 0, 'h' },
 		{ "count", no_argument, 0, 'c' },
@@ -607,6 +639,8 @@ int main(int argc, char **argv)
 		{ "limit", required_argument, 0, 'l' },
 		{ "null", no_argument, 0, '0' },
 		{ "version", no_argument, 0, 'V' },
+		{ "regexp", no_argument, 0, 'r' },
+		{ "regex", no_argument, 0, EXTENDED_REGEX },
 		{ "debug", no_argument, 0, 'D' },  // Not documented.
 		{ 0, 0, 0, 0 }
 	};
@@ -634,10 +668,21 @@ int main(int argc, char **argv)
 		case 'l':
 		case 'n':
 			limit_matches = atoll(optarg);
+			if (limit_matches <= 0) {
+				fprintf(stderr, "Error: limit must be a strictly positive number.\n");
+				exit(1);
+			}
 			break;
 		case '0':
 			print_nul = true;
 			break;
+		case 'r':
+			patterns_are_regex = true;
+			break;
+		case EXTENDED_REGEX:
+			patterns_are_regex = true;
+			use_extended_regex = true;
+			break;
 		case 'D':
 			use_debug = true;
 			break;
@@ -674,7 +719,10 @@ int main(int argc, char **argv)
 			}
 		}
 
-		if (any_wildcard) {
+		if (patterns_are_regex) {
+			needle.type = Needle::REGEX;
+			needle.re = compile_regex(needle.str);
+		} else if (any_wildcard) {
 			needle.type = Needle::GLOB;
 		} else if (ignore_case) {
 			// strcasestr() doesn't handle locales correctly (even though LSB