Merge pull request linux-can#547 from vuquangtrong/master

asc2log::get_date check for AM in en_US time format
marckleinebudde · Jun 12, 2024 · 4eb72fd · 4eb72fd
2 parents 8474860 + 51b1f67
commit 4eb72fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/asc2log.c b/asc2log.c
@@ -384,7 +384,7 @@ static int get_date(struct timeval *tv, char *date)
 	struct tm tms;
 	unsigned int msecs = 0;
 
-	if (strcasestr(date, " pm ") != NULL) {
+	if ((strcasestr(date, " am ") != NULL) || (strcasestr(date, " pm ") != NULL)) {
 		/* assume EN/US date due to existing am/pm field */
 
 		if (!setlocale(LC_TIME, "en_US")) {