X-Git-Url: http://git.scottworley.com/keystroke-timestamps/blobdiff_plain/cff44ceb395fdff824f2efa650e14125c43cf4de..3070d2c25c36fa0ff52eccb7632f491bc653d05d:/keystroke-timestamps.c?ds=sidebyside

diff --git a/keystroke-timestamps.c b/keystroke-timestamps.c
index 6cb4973..73ce86e 100644
--- a/keystroke-timestamps.c
+++ b/keystroke-timestamps.c
@@ -1,10 +1,10 @@
 #include <err.h>
 #include <fcntl.h>
+#include <glob.h>
 #include <getopt.h>
 #include <linux/input.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sysexits.h>
 #include <sys/select.h>
 #include <unistd.h>
@@ -12,9 +12,11 @@
 int main (int argc, char **argv)
 {
   int print_usec = 0;
-  char* device = strdup("/dev/input/by-path/platform-i8042-serio-0-event-kbd");
+  char* device = "/dev/input/by-path/*kbd*";
+  char* output = NULL;
   struct option long_options[] = {
     {"device", required_argument, 0,            'd' },
+    {"output", required_argument, 0,            'o' },
     {"usec",   no_argument,       &print_usec,  1   },
     {0,        0,                 0,            0   },
   };
@@ -22,25 +24,55 @@ int main (int argc, char **argv)
     int c = getopt_long(argc, argv, "", long_options, NULL);
     if (c == -1) break;
     if (c == 'd') {
-      free(device);
-      device = strdup(optarg);
+      device = optarg;
+      continue;
+    }
+    if (c == 'o') {
+      output = optarg;
       continue;
     }
     if (c != 0) exit(EX_USAGE);
   }
 
-  int open_fd = open(device, O_RDONLY);
-  if (open_fd < 0) {
-    err(EX_NOINPUT, "Could not open keyboard event file");
+  /* Open output file */
+  FILE *output_file;
+  if (output == NULL) {
+    output_file = stdout;
+  } else {
+    output_file = fopen(output, "a");
+    if (output_file == NULL) {
+      err(EX_CANTCREAT, "Could not open output file: %s", output);
+    }
   }
-  int maxfd = open_fd;
-  free(device);
-  struct input_event i;
-  fd_set all_inputs, ready_inputs;
+
+  /* Open device inputs */
+  fd_set all_inputs;
   FD_ZERO(&all_inputs);
-  FD_SET(open_fd, &all_inputs);
+  int maxfd = 0;
+  glob_t glob_result;
+  int glob_return = glob(device, GLOB_ERR | GLOB_NOSORT, NULL, &glob_result);
+  if (glob_return == GLOB_NOMATCH) {
+    errx(EX_NOINPUT, "Could not find keyboard event file(s): %s", device);
+  }
+  if (glob_return != 0) {
+    err(EX_NOINPUT, "Could not glob keyboard event file(s): %s", device);
+  }
+  for (unsigned i = 0; i < glob_result.gl_pathc; i++) {
+    int device_fd = open(glob_result.gl_pathv[i], O_RDONLY);
+    if (device_fd < 0) {
+      err(EX_NOINPUT, "Could not open keyboard event file: %s", glob_result.gl_pathv[i]);
+    }
+    if (device_fd > maxfd) {
+      maxfd = device_fd;
+    }
+    FD_SET(device_fd, &all_inputs);
+  }
+  globfree(&glob_result);
+
+  /* Report keystroke timestamps */
+  struct input_event i;
   while (1) {
-    ready_inputs = all_inputs;
+    fd_set ready_inputs = all_inputs;
     if (select(maxfd+1, &ready_inputs, NULL, NULL, NULL) != 1) {
       err(EX_IOERR, "select");
     }
@@ -55,11 +87,11 @@ int main (int argc, char **argv)
         }
         if (i.type == 1 && i.value == 1) {
           if (print_usec) {
-            printf("%ld.%06ld\n", i.time.tv_sec, i.time.tv_usec);
+            fprintf(output_file, "%ld.%06ld\n", i.time.tv_sec, i.time.tv_usec);
           } else {
-            printf("%ld\n", i.time.tv_sec);
+            fprintf(output_file, "%ld\n", i.time.tv_sec);
           }
-          fflush(stdout);
+          fflush(output_file);
         }
       }
     }