X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plocate.cpp;h=079eb2996cf40e7d4a8c3fe5b1d37d7485e6f9a7;hb=acce03bb32917e21f2d1d49c5a460d3cd2f72a11;hp=55e19342b84cb4ac4d808e403c48e33aa75dfa5f;hpb=b6d598e43038ad053e2b15141fcb3c18c13ba025;p=plocate

diff --git a/plocate.cpp b/plocate.cpp
index 55e1934..079eb29 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"
@@ -55,6 +56,7 @@ bool use_extended_regex = false;
 bool match_basename = false;
 int64_t limit_matches = numeric_limits<int64_t>::max();
 int64_t limit_left = numeric_limits<int64_t>::max();
+bool stdout_is_tty = false;
 
 steady_clock::time_point start;
 ZSTD_DDict *ddict = nullptr;
@@ -500,6 +502,8 @@ void do_search_file(const vector<Needle> &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<float>(steady_clock::now() - start).count(), matched);
 		if (only_count) {
 			printf("%" PRId64 "\n", matched);
 		}
@@ -599,7 +603,7 @@ void do_search_file(const vector<Needle> &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<const unsigned char *>(s.data());
 				size_t num = trgmptr.num_docids;
 				decoded.resize(num);
@@ -698,7 +702,7 @@ int main(int argc, char **argv)
 	setlocale(LC_ALL, "");
 	for (;;) {
 		int option_index = 0;
-		int c = getopt_long(argc, argv, "bcd:hil:n:0wVD", long_options, &option_index);
+		int c = getopt_long(argc, argv, "bcd:hil:n:0rwVD", long_options, &option_index);
 		if (c == -1) {
 			break;
 		}
@@ -765,6 +769,10 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (!print_nul) {
+		stdout_is_tty = isatty(1);
+	}
+
 	vector<Needle> needles;
 	for (int i = optind; i < argc; ++i) {
 		Needle needle;