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

candump: add option to define individual filename for logfile 

Link: https://github.com/linux-can/can-utils/pull/345
Suggested-by: https://github.com/xR3b0rn
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/346/head
Oliver Hartkopp 2022-02-15 19:41:06 +01:00
parent ec6a573de1
commit 74d9feb104
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
candump.c
View File

@ -135,6 +135,7 @@ static void print_usage(char *prg)
fprintf(stderr, " -S (swap byte order in printed CAN data[] - marked with '%c' )\n", SWAP_DELIMITER);
fprintf(stderr, " -s <level> (silent mode - %d: off (default) %d: animation %d: silent)\n", SILENT_OFF, SILENT_ANI, SILENT_ON);
fprintf(stderr, " -l (log CAN-frames into file. Sets '-s %d' by default)\n", SILENT_ON);
fprintf(stderr, " -f <fname> (log CAN-frames into file <fname>. Sets '-s %d' by default)\n", SILENT_ON);
fprintf(stderr, " -L (use log file format on stdout)\n");
fprintf(stderr, " -n <count> (terminate after reception of <count> CAN frames)\n");
fprintf(stderr, " -r <size> (set socket receive buffer to <size>)\n");
@ -314,6 +315,7 @@ int main(int argc, char **argv)
struct timeval tv, last_tv;
int timeout_ms = -1; /* default to no timeout */
FILE *logfile = NULL;
char *logname = NULL;
signal(SIGTERM, sigterm);
signal(SIGHUP, sigterm);
@ -322,7 +324,7 @@ int main(int argc, char **argv)
last_tv.tv_sec = 0;
last_tv.tv_usec = 0;
while ((opt = getopt(argc, argv, "t:HciaSs:lDdxLn:r:he8T:?")) != -1) {
while ((opt = getopt(argc, argv, "t:HciaSs:lDdxLf:n:r:he8T:?")) != -1) {
switch (opt) {
case 't':
timestamp = optarg[0];
@ -394,6 +396,11 @@ int main(int argc, char **argv)
logfrmt = 1;
break;
case 'f':
logname = optarg;
log = 1;
break;
case 'n':
count = atoi(optarg);
if (count < 1) {
@ -651,6 +658,7 @@ int main(int argc, char **argv)
}
if (log) {
if (!logname) {
time_t currtime;
struct tm now;
char fname[83]; /* suggested by -Wformat-overflow= */
@ -670,12 +678,15 @@ int main(int argc, char **argv)
now.tm_min,
now.tm_sec);
logname = fname;
}
if (silent != SILENT_ON)
fprintf(stderr, "Warning: Console output active while logging!\n");
fprintf(stderr, "Enabling Logfile '%s'\n", fname);
fprintf(stderr, "Enabling Logfile '%s'\n", logname);
logfile = fopen(fname, "w");
logfile = fopen(logname, "w");
if (!logfile) {
perror("logfile");
return 1;