Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PR lib/52101 -- 12:30 am is 00:30:00 and 12:30 pm is 12:30:00

Browse Source
This commit is contained in:
kre 2017-03-22 00:59:06 +00:00
parent bda2cfe499
commit b717517d3c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libutil/parsedate.y
View File

@ -14,7 +14,7 @@
#include <sys/cdefs.h>
#ifdef __RCSID
__RCSID("$NetBSD: parsedate.y,v 1.29 2016/06/26 07:09:24 kre Exp $");
__RCSID("$NetBSD: parsedate.y,v 1.30 2017/03/22 00:59:06 kre Exp $");
#endif
#include <stdio.h>
@ -654,7 +654,9 @@ Convert(
tm.tm_sec = Seconds;
tm.tm_min = Minutes;
tm.tm_hour = Hours + (Meridian == MERpm ? 12 : 0);
tm.tm_hour = ((Hours == 12 && Meridian != MER24) ? 0 : Hours) +
(Meridian == MERpm ? 12 : 0);
tm.tm_mday = Day;
tm.tm_mon = Month - 1;
tm.tm_year = Year - 1900;