Merge lp:~peter-hutterer/evemu/comment-parsing into lp:evemu

[Peter Hutterer]

Parse simple comments at the top of the file to allow for more extensive description of what data a file contain.s

[lp:~peter-hutterer/evemu/comment-parsing]

53. By Peter Hutterer on 2012-06-05

Add support for comment lines starting with '#'

Very basic parser, recognises comments at the top of the file, and only if
'#' is the first character of that line.

[Stephen M. Webb (bregma)]

Nice addition. Huzzah!

review: Approve

=== modified file 'README'
--- README	2011-01-05 10:17:01 +0000
+++ README	2012-06-05 01:29:18 +0000
@@ -10,15 +10,17 @@
 and one for the device event data. hex data is without a 0x prefix.
 
 Device Description Format:
+    # comments are allowed at the top of the file only
+    # Only lines with # as first character are regonized
     N: <device name>
     I: <bustype (hex)> <vendor (hex)> <product (hex)> <version (hex)>
-    # for each kernel property (2.3.38 only)
+     --- for each kernel property (2.3.38 only) ---
     P: <byte 0 (hex)> <byte 1 (hex)> ... <byte 7 (hex)>
     P: <byte 8 (hex)> ...
-    # for each index from 0 to EV_CNT
+     --- for each index from 0 to EV_CNT ---
     B: <index (hex)> <byte 0 (hex)> <byte 1 (hex)> ... <byte 7 (hex)>
     B: <index (hex)> <byte 8 (hex)> ...
-    # for each absolute axis
+     --- for each absolute axis ---
     A: <index (hex)> <min> <max> <fuzz> <flat>
 
 
 
=== modified file 'src/evemu.c'
--- src/evemu.c	2012-03-23 15:38:02 +0000
+++ src/evemu.c	2012-06-05 01:29:18 +0000
@@ -62,6 +62,19 @@
 
 #define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
 
+static void skip_comment_block(FILE *fp)
+{
+	int first_char;
+
+	while ((first_char = getc(fp)) == '#') {
+		char *line = NULL;
+		size_t n = 0;
+		getline(&line, &n, fp);
+		free(line);
+	}
+	ungetc(first_char, fp);
+}
+
 static void copy_bits(unsigned char *mask, const unsigned long *bits, int bytes)
 {
 	int i;
@@ -336,6 +349,8 @@
 
 	memset(dev, 0, sizeof(*dev));
 
+	skip_comment_block(fp);
+
 	ret = fscanf(fp, "N: %m[^\n]\n", &devname);
 	if (ret <= 0) {
 		if (devname != NULL)
@@ -435,6 +450,8 @@
 	struct timeval evtime;
 	int ret;
 
+	skip_comment_block(fp);
+
 	memset(&evtime, 0, sizeof(evtime));
 	while (evemu_read_event_realtime(fp, &ev, &evtime) > 0)
 		SYSCALL(ret = write(fd, &ev, sizeof(ev)));