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

Log file max size flag

pull/189/head
Даниил Жуков 2019-12-17 11:30:00 +03:00
parent 21f4b81510
commit c2b2cf0f92
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
candump.c
View File

@ -129,6 +129,7 @@ void print_usage(char *prg)
fprintf(stderr, " -B <can> (bridge mode - like '-b' with disabled loopback)\n"); fprintf(stderr, " -B <can> (bridge mode - like '-b' with disabled loopback)\n");
fprintf(stderr, " -u <usecs> (delay bridge forwarding by <usecs> microseconds)\n"); fprintf(stderr, " -u <usecs> (delay bridge forwarding by <usecs> microseconds)\n");
fprintf(stderr, " -l (log CAN-frames into file. Sets '-s %d' by default)\n", SILENT_ON); fprintf(stderr, " -l (log CAN-frames into file. Sets '-s %d' by default)\n", SILENT_ON);
fprintf(stderr, " -m <size> (log file max size)\n");
fprintf(stderr, " -L (use log file format on stdout)\n"); fprintf(stderr, " -L (use log file format on stdout)\n");
fprintf(stderr, " -n <count> (terminate after reception of <count> CAN frames)\n"); fprintf(stderr, " -n <count> (terminate after reception of <count> CAN frames)\n");
fprintf(stderr, " -r <size> (set socket receive buffer to <size>)\n"); fprintf(stderr, " -r <size> (set socket receive buffer to <size>)\n");
@ -256,6 +257,7 @@ int main(int argc, char **argv)
unsigned char color = 0; unsigned char color = 0;
unsigned char view = 0; unsigned char view = 0;
unsigned char log = 0; unsigned char log = 0;
unsigned long logmax = 0;
unsigned char logfrmt = 0; unsigned char logfrmt = 0;
int count = 0; int count = 0;
int rcvbuf_size = 0; int rcvbuf_size = 0;
@ -284,7 +286,7 @@ int main(int argc, char **argv)
last_tv.tv_sec = 0; last_tv.tv_sec = 0;
last_tv.tv_usec = 0; last_tv.tv_usec = 0;
while ((opt = getopt(argc, argv, "t:HciaSs:b:B:u:lDdxLn:r:heT:?")) != -1) { while ((opt = getopt(argc, argv, "t:HciaSs:b:B:u:lm:DdxLn:r:heT:?")) != -1) {
switch (opt) { switch (opt) {
case 't': case 't':
timestamp = optarg[0]; timestamp = optarg[0];
@ -378,6 +380,10 @@ int main(int argc, char **argv)
log = 1; log = 1;
break; break;
case 'm':
logmax = strtoul(optarg, (char **)NULL, 10); // TODO: Parse strings with sizes: 10mb, 1gb etc
break;
case 'D': case 'D':
down_causes_exit = 0; down_causes_exit = 0;
break; break;
@ -775,7 +781,7 @@ int main(int argc, char **argv)
int n = sprintf(line, "(%010ld.%06ld) %*s %s\n", int n = sprintf(line, "(%010ld.%06ld) %*s %s\n",
tv.tv_sec, tv.tv_usec, tv.tv_sec, tv.tv_usec,
max_devname_len, devname[idx], buf); max_devname_len, devname[idx], buf);
if (ftell(logfile) + n > 1024) { if (logmax && ftell(logfile) + n > logmax) {
fclose(logfile); fclose(logfile);
if (openlogfile(&logfile) != 0) if (openlogfile(&logfile) != 0)
return 1; return 1;