Make EOF fatal

[keystroke-timestamps] / keystroke-timestamps.c

diff --git a/keystroke-timestamps.c b/keystroke-timestamps.c
index fd7de5d785bbd52f2482cf1c1d718d9cbd3c40f6..e370b22dba4b06a395124341e62684d1f15e64f5 100644 (file)
--- a/keystroke-timestamps.c
+++ b/keystroke-timestamps.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
+#include <sys/select.h>
 #include <unistd.h>
 
 int main (int argc, char **argv)
@@ -34,10 +35,24 @@ int main (int argc, char **argv)
   }
   free(device);
   struct input_event i;
-  while (read(fd, &i, sizeof(i)) == sizeof(i)) {
+  fd_set all_inputs, ready_inputs;
+  FD_ZERO(&all_inputs);
+  FD_SET(fd, &all_inputs);
+  while (1) {
+    ready_inputs = all_inputs;
+    if (select(fd+1, &ready_inputs, NULL, NULL, NULL) != 1) {
+      err(EX_IOERR, "select");
+    }
+    int read_return = read(fd, &i, sizeof(i));
+    if (read_return == -1) {
+      err(EX_IOERR, "read");
+    }
+    if (read_return != sizeof(i)) {
+      errx(EX_IOERR, "Unexpected EOF");
+    }
     if (i.type == 1 && i.value == 1) {
       if (print_usec) {
-        printf("%ld.%ld\n", i.time.tv_sec, i.time.tv_usec);
+        printf("%ld.%06ld\n", i.time.tv_sec, i.time.tv_usec);
       } else {
         printf("%ld\n", i.time.tv_sec);
       }