sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-05 14:29:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some new ASC files support 6 digits in decimal place.

Browse Source 
Added new option '-4' to generate 'old-style' ASC files.
This commit is contained in:
Oliver Hartkopp
2007-01-09 16:01:46 +00:00
parent f1284e83aa
commit c2424910ac
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
log2asc.c
+11 -2
View File
@@ -64,6 +64,7 @@ void print_usage(char *prg)
fprintf(stderr, "Usage: %s [can-interfaces]\n", prg); fprintf(stderr, "Usage: %s [can-interfaces]\n", prg);
fprintf(stderr, "Options: -I <infile> (default stdin)\n"); fprintf(stderr, "Options: -I <infile> (default stdin)\n");
fprintf(stderr, " -O <outfile> (default stdout)\n"); fprintf(stderr, " -O <outfile> (default stdout)\n");
fprintf(stderr, " -4 (reduce decimal place to 4 digits)\n");
fprintf(stderr, " -n (set newline to cr/lf - default lf)\n"); fprintf(stderr, " -n (set newline to cr/lf - default lf)\n");
} }
@@ -75,9 +76,9 @@ int main(int argc, char **argv)
static struct timeval tv, start_tv; static struct timeval tv, start_tv;
FILE *infile = stdin; FILE *infile = stdin;
FILE *outfile = stdout; FILE *outfile = stdout;
static int maxdev, devno, i, crlf, opt; static int maxdev, devno, i, crlf, d4, opt;
while ((opt = getopt(argc, argv, "I:O:n")) != -1) { while ((opt = getopt(argc, argv, "I:O:4n")) != -1) {
switch (opt) { switch (opt) {
case 'I': case 'I':
infile = fopen(optarg, "r"); infile = fopen(optarg, "r");
@@ -99,6 +100,10 @@ int main(int argc, char **argv)
crlf = 1; crlf = 1;
break; break;
case '4':
d4 = 1;
break;
default: default:
fprintf(stderr, "Unknown option %c\n", opt); fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0])); print_usage(basename(argv[0]));
@@ -148,7 +153,11 @@ int main(int argc, char **argv)
tv.tv_sec--, tv.tv_usec += 1000000; tv.tv_sec--, tv.tv_usec += 1000000;
if (tv.tv_sec < 0) if (tv.tv_sec < 0)
tv.tv_sec = tv.tv_usec = 0; tv.tv_sec = tv.tv_usec = 0;
if (d4)
fprintf(outfile, "%4ld.%04ld ", tv.tv_sec, tv.tv_usec/100); fprintf(outfile, "%4ld.%04ld ", tv.tv_sec, tv.tv_usec/100);
else
fprintf(outfile, "%4ld.%06ld ", tv.tv_sec, tv.tv_usec);
fprintf(outfile, "%-2d ", devno); /* channel number left aligned */ fprintf(outfile, "%-2d ", devno); /* channel number left aligned */