From: hartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Date: Thu, 24 Jul 2008 19:12:19 +0000 (+0000)
Subject: Changed comment line recognition:
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/commitdiff_plain/f941cd3683a6109c137ff09739f24fdbf44ee8bf

Changed comment line recognition:
Everything without a '(' at the beginning of an input line is treated as comment.
Changed buffer size to allow long comment lines & added overflow handling.


git-svn-id: svn://svn.berlios.de//socketcan/trunk@812 030b6a49-0b11-0410-94ab-b0dab22257f2
---

diff --git a/can-utils/canplayer.c b/can-utils/canplayer.c
index ae18df9..e8a1356 100644
--- a/can-utils/canplayer.c
+++ b/can-utils/canplayer.c
@@ -60,11 +60,10 @@
 
 #include "lib.h"
 
-#define DEFAULT_GAP 1 /* ms */
-#define DEFAULT_LOOPS 1 /* only one replay */
-#define CHANNELS 20   /* anyone using more than 20 CAN interfaces at a time? */
-#define BUFSZ 100     /* for one line in the logfile */
-#define COMMENT '#'
+#define DEFAULT_GAP	1	/* ms */
+#define DEFAULT_LOOPS	1	/* only one replay */
+#define CHANNELS	20	/* anyone using more than 20 CAN interfaces at a time? */
+#define BUFSZ		400	/* for one line in the logfile */
 
 struct assignment {
 	char txif[IFNAMSIZ];
@@ -99,8 +98,8 @@ void print_usage(char *prg)
 		"vcan2 )\n");
 	fprintf(stderr, "No assignments => send frames to the interface(s) they "
 		"had been received from.\n\n");
-	fprintf(stderr, "Lines in the logfile beginning with '%c' are ignored."
-		"\n\n", COMMENT);
+	fprintf(stderr, "Lines in the logfile not beginning with '(' (start of "
+		"timestamp) are ignored.\n\n");
 }
 
 /* copied from /usr/src/linux/include/linux/time.h ...
@@ -370,8 +369,12 @@ int main(int argc, char **argv)
 			printf (">>>>>>>>> start reading file. remaining loops = %d\n", loops);
 
 		/* read first non-comment frame from logfile */
-		while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] == COMMENT)
-			;
+		while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] != '(') {
+			if (strlen(buf) >= BUFSZ-2) {
+				fprintf(stderr, "comment line too long for input buffer\n");
+				return 1;
+			}
+		}
 
 		if (!fret)
 			goto out; /* nothing to read */
@@ -436,8 +439,12 @@ int main(int argc, char **argv)
 				}
 
 				/* read next non-comment frame from logfile */
-				while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] == COMMENT)
-					;
+				while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] != '(') {
+					if (strlen(buf) >= BUFSZ-2) {
+						fprintf(stderr, "comment line too long for input buffer\n");
+						return 1;
+					}
+				}
 
 				if (!fret) {
 					eof = 1; /* this file is completely processed */