Make EOF fatal

[keystroke-timestamps] / keystroke-timestamps.c

diff --git a/keystroke-timestamps.c b/keystroke-timestamps.c
index 2ab4c42938a2cb3177bd1f00c1a2f413d8ba712c..e370b22dba4b06a395124341e62684d1f15e64f5 100644 (file)
--- a/keystroke-timestamps.c
+++ b/keystroke-timestamps.c
@@ -6,30 +6,53 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>

+#include <sys/select.h>

 #include <unistd.h>
 
 int main (int argc, char **argv)
 {
   int print_usec = 0;
 #include <unistd.h>
 
 int main (int argc, char **argv)
 {
   int print_usec = 0;

+  char* device = strdup("/dev/input/by-path/platform-i8042-serio-0-event-kbd");

   struct option long_options[] = {
   struct option long_options[] = {

+    {"device", required_argument, 0,            'd' },

     {"usec",   no_argument,       &print_usec,  1   },
     {0,        0,                 0,            0   },
   };
   while (1) {
     int c = getopt_long(argc, argv, "", long_options, NULL);
     if (c == -1) break;
     {"usec",   no_argument,       &print_usec,  1   },
     {0,        0,                 0,            0   },
   };
   while (1) {
     int c = getopt_long(argc, argv, "", long_options, NULL);
     if (c == -1) break;

+    if (c == 'd') {
+      free(device);
+      device = strdup(optarg);
+      continue;
+    }

     if (c != 0) exit(EX_USAGE);
   }
 
     if (c != 0) exit(EX_USAGE);
   }
 

-  int fd = open("/dev/input/by-path/platform-i8042-serio-0-event-kbd", O_RDONLY);
+  int fd = open(device, O_RDONLY);

   if (fd < 0) {
     err(EX_NOINPUT, "Could not open keyboard event file");
   }
   if (fd < 0) {
     err(EX_NOINPUT, "Could not open keyboard event file");
   }

+  free(device);

   struct input_event i;
   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) {
     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);
       }
       } else {
         printf("%ld\n", i.time.tv_sec);
       }