X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plocate.cpp;h=c47c6480465a7f9e70472e7cbac984e3c6ddc78d;hb=498466c6434e479cd973fe7655b4feb51dd2c378;hp=e08c019b84d58f7b74054533010cfb61adfe4c16;hpb=88057cd64f62c3f39e8ccf158fd0c3df101e02cb;p=plocate diff --git a/plocate.cpp b/plocate.cpp index e08c019..c47c648 100644 --- a/plocate.cpp +++ b/plocate.cpp @@ -1,4 +1,5 @@ #include "access_rx_cache.h" +#include "complete_pread.h" #include "db.h" #include "dprintf.h" #include "io_uring_engine.h" @@ -42,9 +43,7 @@ using namespace std; using namespace std::chrono; -#define DEFAULT_DBPATH "/var/lib/mlocate/plocate.db" - -const char *dbpath = DEFAULT_DBPATH; +const char *dbpath = DBFILE; bool ignore_case = false; bool only_count = false; bool print_nul = false; @@ -52,8 +51,10 @@ bool use_debug = false; bool flush_cache = false; bool patterns_are_regex = false; bool use_extended_regex = false; +bool match_basename = false; int64_t limit_matches = numeric_limits::max(); int64_t limit_left = numeric_limits::max(); +bool stdout_is_tty = false; steady_clock::time_point start; ZSTD_DDict *ddict = nullptr; @@ -104,6 +105,10 @@ Corpus::Corpus(int fd, IOUringEngine *engine) hdr.zstd_dictionary_offset_bytes = 0; hdr.zstd_dictionary_length_bytes = 0; } + if (hdr.max_version < 2) { + // This too. (We ignore the other max_version 2 fields.) + hdr.check_visibility = true; + } } Corpus::~Corpus() @@ -194,9 +199,19 @@ void scan_file_block(const vector &needles, string_view compressed, for (const char *filename = block.data(); filename != block.data() + block.size(); filename += strlen(filename) + 1) { + const char *haystack = filename; + if (match_basename) { + haystack = strrchr(filename, '/'); + if (haystack == nullptr) { + haystack = filename; + } else { + ++haystack; + } + } + bool found = true; for (const Needle &needle : needles) { - if (!matches(needle, filename)) { + if (!matches(needle, haystack)) { found = false; break; } @@ -219,7 +234,7 @@ void scan_file_block(const vector &needles, string_view compressed, size_t scan_docids(const vector &needles, const vector &docids, const Corpus &corpus, IOUringEngine *engine) { Serializer docids_in_order; - AccessRXCache access_rx_cache(engine); + AccessRXCache access_rx_cache(engine, corpus.get_hdr().check_visibility); atomic matched{ 0 }; for (size_t i = 0; i < docids.size(); ++i) { uint32_t docid = docids[i]; @@ -295,7 +310,7 @@ uint64_t scan_all_docids(const vector &needles, int fd, const Corpus &co } } - AccessRXCache access_rx_cache(nullptr); + AccessRXCache access_rx_cache(nullptr, corpus.get_hdr().check_visibility); Serializer serializer; uint32_t num_blocks = corpus.get_num_filename_blocks(); unique_ptr offsets(new uint64_t[num_blocks + 1]); @@ -489,6 +504,8 @@ void do_search_file(const vector &needles, const char *filename) // the pattern and done a union of them, but that's a lot of // work for fairly unclear gain.) uint64_t matched = scan_all_docids(needles, fd, corpus); + dprintf("Done in %.1f ms, found %" PRId64 " matches.\n", + 1e3 * duration(steady_clock::now() - start).count(), matched); if (only_count) { printf("%" PRId64 "\n", matched); } @@ -588,7 +605,7 @@ void do_search_file(const vector &needles, const char *filename) if (done) return; - uint32_t trgm __attribute__((unused)) = trgmptr.trgm; + uint32_t trgm = trgmptr.trgm; const unsigned char *pldata = reinterpret_cast(s.data()); size_t num = trgmptr.num_docids; decoded.resize(num); @@ -638,21 +655,23 @@ void usage() printf( "Usage: plocate [OPTION]... PATTERN...\n" "\n" + " -b, --basename search only the file name portion of path names\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" + " (default is " DBFILE ")\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" + " -w, --wholename search the entire path name (default; see -b)\n" " --help print this help\n" " --version print version information\n"); } void version() { - printf("plocate %s\n", PLOCATE_VERSION); + printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION); printf("Copyright 2020 Steinar H. Gunderson\n"); printf("License GPLv2+: GNU GPL version 2 or later .\n"); printf("This is free software: you are free to change and redistribute it.\n"); @@ -667,6 +686,7 @@ int main(int argc, char **argv) static const struct option long_options[] = { { "help", no_argument, 0, 'h' }, { "count", no_argument, 0, 'c' }, + { "basename", no_argument, 0, 'b' }, { "database", required_argument, 0, 'd' }, { "ignore-case", no_argument, 0, 'i' }, { "limit", required_argument, 0, 'l' }, @@ -674,6 +694,7 @@ int main(int argc, char **argv) { "version", no_argument, 0, 'V' }, { "regexp", no_argument, 0, 'r' }, { "regex", no_argument, 0, EXTENDED_REGEX }, + { "wholename", no_argument, 0, 'w' }, { "debug", no_argument, 0, 'D' }, // Not documented. // Enable to test cold-cache behavior (except for access()). Not documented. { "flush-cache", no_argument, 0, FLUSH_CACHE }, @@ -683,11 +704,14 @@ int main(int argc, char **argv) setlocale(LC_ALL, ""); for (;;) { int option_index = 0; - int c = getopt_long(argc, argv, "cd:hil:n:0VD", long_options, &option_index); + int c = getopt_long(argc, argv, "bcd:hil:n:0rwVD", long_options, &option_index); if (c == -1) { break; } switch (c) { + case 'b': + match_basename = true; + break; case 'c': only_count = true; break; @@ -718,6 +742,9 @@ int main(int argc, char **argv) patterns_are_regex = true; use_extended_regex = true; break; + case 'w': + match_basename = false; // No-op unless -b is given first. + break; case 'D': use_debug = true; break; @@ -744,6 +771,10 @@ int main(int argc, char **argv) } } + if (!print_nul) { + stdout_is_tty = isatty(1); + } + vector needles; for (int i = optind; i < argc; ++i) { Needle needle;