Merge lp:~jpakkane/evemu/robustness into lp:evemu

[Jussi Pakkanen]

Makes evemu-record write its output more robustly. Flush every event write and allow the user to specify an output file.

[lp:~jpakkane/evemu/robustness]

43. By Jussi Pakkanen on 2011-06-28

Add signal handler to flush data in case of abrupt exit.

44. By Jussi Pakkanen on 2011-06-28

Indentation fix.

[Chase Douglas (chasedouglas)]

Looks good to me, and fixes a long standing issue :).

review: Approve

[Stephen M. Webb (bregma)]

Does the right thing.

review: Approve

=== modified file 'src/evemu.c'
--- src/evemu.c	2011-04-21 08:49:45 +0000
+++ src/evemu.c	2011-06-28 16:24:39 +0000
@@ -379,6 +379,7 @@
 			return ret;
 		if (ret == sizeof(ev))
 			evemu_write_event(fp, &ev);
+			fflush(fp);
 	}
 
 	return 0;
 
=== modified file 'tools/evemu-record.c'
--- tools/evemu-record.c	2011-02-03 02:29:13 +0000
+++ tools/evemu-record.c	2011-06-28 16:24:39 +0000
@@ -45,14 +45,24 @@
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <signal.h>
 
 #define WAIT_MS 10000
 
+FILE *output;
+
+static void handler (int sig)
+{
+	fflush(output);
+	if (output != stdout)
+		fclose(output);
+}
+
 int main(int argc, char *argv[])
 {
 	int fd;
 	if (argc < 2) {
-		fprintf(stderr, "Usage: %s <device>\n", argv[0]);
+		fprintf(stderr, "Usage: %s <device> [output file]\n", argv[0]);
 		return -1;
 	}
 	fd = open(argv[1], O_RDONLY | O_NONBLOCK);
@@ -60,9 +70,34 @@
 		fprintf(stderr, "error: could not open device\n");
 		return -1;
 	}
-	if (evemu_record(stdout, fd, WAIT_MS)) {
+
+	struct sigaction act;
+	memset (&act, '\0', sizeof(act));
+	act.sa_handler = &handler;
+
+	if (sigaction(SIGTERM, &act, NULL) < 0) {
+		fprintf (stderr, "Could not attach TERM signal handler.\n");
+		return 1;
+	}
+	if (sigaction(SIGINT, &act, NULL) < 0) {
+		fprintf (stderr, "Could not attach INT signal handler.\n");
+		return 1;
+	}
+
+	if (argc < 3)
+		output = stdout;
+	else {
+		output = fopen(argv[2], "w");
+		if (!output) {
+			fprintf(stderr, "error: could not open output file");
+		}
+	}
+
+	if (evemu_record(output, fd, WAIT_MS)) {
 		fprintf(stderr, "error: could not describe device\n");
 	}
 	close(fd);
+	if (output != stdout)
+		fclose(output);
 	return 0;
 }