d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strptime(3) confused July with June with the fr_FR locale.

Browse Source 
When parsing the month "juillet" (abbr "jul"), %B recognized it as
"juin" (abbr "jui") because the full name of the month names is
checked at the same time as the abbrevation.

The new behaviour checks the full names first before checking the
abbrevation names.

PR:		kern/141939
Submitted by:	Denis Chatelain <denis@tikuts.com>
MFC after:	1 week
This commit is contained in:
edwin 2010-05-09 22:01:35 +00:00
parent 9dd8f2f460
commit 7bcd31a958
1 changed files with 8 additions and 0 deletions

8
lib/libc/stdtime/strptime.c

@ -408,6 +408,14 @@ label:
if (strncasecmp(buf, tptr->month[i],
len) == 0)
break;
}
}
/*
* Try the abbreviated month name if the full name
* wasn't found and Oalternative was not requested.
*/
if (i == asizeof(tptr->month) && !Oalternative) {
for (i = 0; i < asizeof(tptr->month); i++) {
len = strlen(tptr->mon[i]);
if (strncasecmp(buf, tptr->mon[i],
len) == 0)