sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-04 22:09:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed comment line recognition:

Browse Source 
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.
This commit is contained in:
Oliver Hartkopp
2008-07-24 19:12:19 +00:00
parent ba037dcffa
commit 15ce202e60
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canplayer.c
+18 -11
View File
@@ -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 */