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 ae18df9f7bd224399116bdd0c500744495283f31..e8a1356c208a4ebc3a427a3fe8a47a8f5aeca79b 100644 (file)
--- 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 */