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

asc2log: make date time sting milliseconds aware 

strptime() does not support milliseconds but the latest ASC logfile
also provides a fraction of seconds, e.g.

date Fri May 8 08:49:04.052 pm 2020

Read the value into the year variable before parsing the real year.
We will therefore omit the milliseconds resolution for now.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/203/head
Oliver Hartkopp 2020-05-09 18:19:24 +02:00
parent 43a3cca54d
commit 3c8197e4d1
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asc2log.c
View File

@ -207,12 +207,12 @@ void eval_canfd(char* buf, struct timeval *date_tvp, char timestamps, char base,
int get_date(struct timeval *tv, char *date) { int get_date(struct timeval *tv, char *date) {
char ctmp[10]; char ctmp[14];
int itmp; int itmp;
struct tm tms; struct tm tms;
if (sscanf(date, "%9s %d %9s %9s %d", ctmp, &itmp, ctmp, ctmp, &itmp) == 5) { if (sscanf(date, "%9s %d %13s %3s %d", ctmp, &itmp, ctmp, ctmp, &itmp) == 5) {
/* assume EN/US date due to existing am/pm field */ /* assume EN/US date due to existing am/pm field */
if (!setlocale(LC_TIME, "en_US")) { if (!setlocale(LC_TIME, "en_US")) {
@ -220,13 +220,18 @@ int get_date(struct timeval *tv, char *date) {
return 1; return 1;
} }
if (!strptime(date, "%B %d %r %Y", &tms)) if (!strptime(date, "%B %d %I:%M:%S %p %Y", &tms)) {
return 1; /* The string might contain a milliseconds value which strptime()
does not support. So we read the ms value into the year variable
before parsing the real year value (hack) */
if (!strptime(date, "%B %d %I:%M:%S.%Y %p %Y", &tms))
return 1;
}
} else { } else {
/* assume DE date due to non existing am/pm field */ /* assume DE date due to non existing am/pm field */
if (sscanf(date, "%9s %d %9s %d", ctmp, &itmp, ctmp, &itmp) != 4) if (sscanf(date, "%9s %d %13s %d", ctmp, &itmp, ctmp, &itmp) != 4)
return 1; return 1;
if (!setlocale(LC_TIME, "de_DE")) { if (!setlocale(LC_TIME, "de_DE")) {
@ -234,8 +239,13 @@ int get_date(struct timeval *tv, char *date) {
return 1; return 1;
} }
if (!strptime(date, "%B %d %T %Y", &tms)) if (!strptime(date, "%B %d %H:%M:%S %Y", &tms)) {
return 1; /* The string might contain a milliseconds value which strptime()
does not support. So we read the ms value into the year variable
before parsing the real year value (hack) */
if (!strptime(date, "%B %d %H:%M:%S.%Y %Y", &tms))
return 1;
}
} }
//printf("h %d m %d s %d d %d m %d y %d\n", //printf("h %d m %d s %d d %d m %d y %d\n",