summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2022-06-08 15:01:08 -0400
committerJune McEnroe <june@causal.agency>2022-06-08 15:01:08 -0400
commit9429b55ef96cf7908dc3460e4db5cc1b1a2c84dc (patch)
treee57126ca046d382533bd0903e3b6dd863cacc457
parentAdd Maiden, Mother, Crone (diff)
downloadsrc-9429b55ef96cf7908dc3460e4db5cc1b1a2c84dc.tar.gz
src-9429b55ef96cf7908dc3460e4db5cc1b1a2c84dc.zip
Indicate if still reading or no results
-rw-r--r--bin/qf.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/bin/qf.c b/bin/qf.c
index ba20483d..1fbf48b9 100644
--- a/bin/qf.c
+++ b/bin/qf.c
@@ -114,13 +114,17 @@ static void curse(void) {
 
 static size_t top;
 static size_t cur;
+static bool reading = true;
 
 static void draw(void) {
-	int y, x;
+	int y = 0, x = 0;
 	for (int i = 0; i < LINES; ++i) {
 		move(i, 0);
 		clrtoeol();
-		if (top + i >= lines.len) continue;
+		if (top + i >= lines.len) {
+			addstr(reading ? "..." : !lines.len ? "No results" : "");
+			break;
+		}
 		struct Line line = lines.ptr[top + i];
 		if (top + i == cur) {
 			getyx(stdscr, y, x);
@@ -248,23 +252,23 @@ int main(int argc, char *argv[]) {
 		if (error) errx(EX_USAGE, "invalid pattern");
 	}
 	curse();
+	draw();
 	struct pollfd fds[2] = {
 		{ .fd = STDERR_FILENO, .events = POLLIN },
 		{ .fd = STDIN_FILENO, .events = POLLIN },
 	};
-	int nfds = 2;
 	size_t len = 0;
 	size_t cap = 4096;
 	char *buf = malloc(cap);
 	if (!buf) err(EX_OSERR, "malloc");
-	while (poll(fds, nfds, -1)) {
+	while (poll(fds, (reading ? 2 : 1), -1)) {
 		if (fds[0].revents) {
 			input();
 		}
-		if (nfds > 1 && fds[1].revents) {
+		if (reading && fds[1].revents) {
 			ssize_t n = read(fds[1].fd, &buf[len], cap - len);
 			if (n < 0) err(EX_IOERR, "read");
-			if (!n) nfds--;
+			if (!n) reading = false;
 			len += n;
 			char *ptr = buf;
 			for (