X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plocate.cpp;h=423aaf7e632f408bcdedcb48163c1918e7a7510b;hb=355ab0d214ee0f08fb44ebeafd70d5e93db84c10;hp=e863edbc4ab9294c89bcbd45e822c560190e0f7f;hpb=5905e207c8ca995c4ffeac138d0697dcf5ddc6cc;p=plocate

diff --git a/plocate.cpp b/plocate.cpp
index e863edb..423aaf7 100644
--- a/plocate.cpp
+++ b/plocate.cpp
@@ -55,6 +55,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;
@@ -501,7 +502,7 @@ void do_search_file(const vector<Needle> &needles, const char *filename)
 		// 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);
+		        1e3 * duration<float>(steady_clock::now() - start).count(), matched);
 		if (only_count) {
 			printf("%" PRId64 "\n", matched);
 		}
@@ -601,7 +602,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);
@@ -700,7 +701,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;
 		}
@@ -767,6 +768,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;