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

Fix y2k bug in inittod(). 

I misunderstood that "bad date in battery clock" message was
caused by dead-battery NVRAM. *sigh*
This commit is contained in:
tsutsui 2000-01-09 15:56:52 +00:00
parent b1b361cb53
commit 15e19e87b9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/news68k/news68k/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.1 1999/12/09 14:53:16 tsutsui Exp $ */ /* $NetBSD: clock.c,v 1.2 2000/01/09 15:56:52 tsutsui Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -205,12 +205,13 @@ chiptotime(sec, min, hour, day, mon, year)
day = FROMBCD(day); day = FROMBCD(day);
mon = FROMBCD(mon); mon = FROMBCD(mon);
year = FROMBCD(year); year = FROMBCD(year);
year = year + (year >= 70 ? 1900 : 2000);
/* simple sanity checks */ /* simple sanity checks */
if (year < 70 || mon < 1 || mon > 12 || day < 1 || day > 31) if (mon < 1 || mon > 12 || day < 1 || day > 31)
return (0); return (0);
days = 0; days = 0;
for (yr = 70; yr < year; yr++) for (yr = 1970; yr < year; yr++)
days += LEAPYEAR(yr) ? 366 : 365; days += LEAPYEAR(yr) ? 366 : 365;
days += dayyr[mon - 1] + day - 1; days += dayyr[mon - 1] + day - 1;
if (LEAPYEAR(yr) && mon > 2) if (LEAPYEAR(yr) && mon > 2)
@ -237,6 +238,8 @@ timetochip(c)
t2 -= LEAPYEAR(t) ? 366 : 365; t2 -= LEAPYEAR(t) ? 366 : 365;
} }
c->year = t; c->year = t;
if (c->year >= 100)
c->year -= 100;
/* t3 = month + day; separate */ /* t3 = month + day; separate */
t = LEAPYEAR(t); t = LEAPYEAR(t);