sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for comment lines in the logfile: 

'#' at the beginning of a line marks comment lines.
pull/7/head
Oliver Hartkopp 2008-07-24 13:03:18 +00:00
parent 5621884558
commit ba037dcffa
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
canplayer.c
View File

@ -64,6 +64,7 @@
#define DEFAULT_LOOPS 1 /* only one replay */ #define DEFAULT_LOOPS 1 /* only one replay */
#define CHANNELS 20 /* anyone using more than 20 CAN interfaces at a time? */ #define CHANNELS 20 /* anyone using more than 20 CAN interfaces at a time? */
#define BUFSZ 100 /* for one line in the logfile */ #define BUFSZ 100 /* for one line in the logfile */
#define COMMENT '#'
struct assignment { struct assignment {
char txif[IFNAMSIZ]; char txif[IFNAMSIZ];
@ -98,6 +99,8 @@ void print_usage(char *prg)
"vcan2 )\n"); "vcan2 )\n");
fprintf(stderr, "No assignments => send frames to the interface(s) they " fprintf(stderr, "No assignments => send frames to the interface(s) they "
"had been received from.\n\n"); "had been received from.\n\n");
fprintf(stderr, "Lines in the logfile beginning with '%c' are ignored."
"\n\n", COMMENT);
} }
/* copied from /usr/src/linux/include/linux/time.h ... /* copied from /usr/src/linux/include/linux/time.h ...
@ -241,6 +244,7 @@ int main(int argc, char **argv)
int assignments; /* assignments defined on the commandline */ int assignments; /* assignments defined on the commandline */
int txidx; /* sendto() interface index */ int txidx; /* sendto() interface index */
int eof, nbytes, i, j; int eof, nbytes, i, j;
char *fret;
while ((opt = getopt(argc, argv, "I:l:tg:s:xv")) != -1) { while ((opt = getopt(argc, argv, "I:l:tg:s:xv")) != -1) {
switch (opt) { switch (opt) {
@ -365,7 +369,11 @@ int main(int argc, char **argv)
if (verbose > 1) /* use -v -v to see this */ if (verbose > 1) /* use -v -v to see this */
printf (">>>>>>>>> start reading file. remaining loops = %d\n", loops); printf (">>>>>>>>> start reading file. remaining loops = %d\n", loops);
if (!fgets(buf, BUFSZ-1, infile)) /* read first frame from logfile */ /* read first non-comment frame from logfile */
while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] == COMMENT)
;
if (!fret)
goto out; /* nothing to read */ goto out; /* nothing to read */
eof = 0; eof = 0;
@ -427,8 +435,11 @@ int main(int argc, char **argv)
} }
} }
/* read next frame from logfile */ /* read next non-comment frame from logfile */
if (!fgets(buf, BUFSZ-1, infile)) { while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] == COMMENT)
;
if (!fret) {
eof = 1; /* this file is completely processed */ eof = 1; /* this file is completely processed */
break; break;
} }