mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Fix leap year calculations, including 2000. The code was broken for all

Browse Source 
years!
Reviewed by:	<thepish@freebsd.org>, <ishisone@sra.co.jp>
This commit is contained in:
Daniel O'Callaghan 1999-01-12 19:37:32 +00:00
parent 02b1a04fd5
commit 482e17399a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=42595
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/xntpd/parse/util/dcfd.c
View File

@ -68,7 +68,7 @@ MUST DEFINE ONE OF "HAVE_TERMIOS" or "HAVE_TERMIO"
#endif
#ifndef dysize
#define dysize(_x_) (((_x_) % 4) ? 365 : (((_x_) % 400) ? 365 : 366))
#define dysize(_x_) (((_x_) % 4) ? 365 : (((_x_) % 100) ? 366 : ((_x_) % 400 ? 365 : 366 )))
#endif
#define timernormalize(_a_) \
@ -761,7 +761,8 @@ dcf_to_unixtime(clock, cvtrtc)
*/
t = (clock->year - 1970) * 365;
t += (clock->year >> 2) - (1970 >> 2);
t -= clock->year / 400 - 1970 / 400;
t -= clock->year / 100 - 1970 / 100;
t += clock->year / 400 - 1970 / 400;
/* month */
if (clock->month <= 0 || clock->month > 12)
@ -1587,9 +1588,10 @@ main(argc, argv)
-tt.tv_usec;
/*
* output interpreted DCF77 data
* output interpreted DCF77 data. DCF77 gives us a YY year
* but dcf_to_unixtime() adds the century, so print YYYY.
*/
PRINTF(offsets ? "%s, %2d:%02d:%02d, %d.%02d.%02d, <%s%s%s%s> (%c%d.%06ds)" :
PRINTF(offsets ? "%s, %2d:%02d:%02d, %d.%02d.%4d, <%s%s%s%s> (%c%d.%06ds)" :
"%s, %2d:%02d:%02d, %d.%02d.%02d, <%s%s%s%s>",
wday[clock.wday],
clock.hour, clock.minute, i, clock.day, clock.month,

3
usr.sbin/xntpd/parse/util/testdcf.c
View File

@ -451,6 +451,9 @@ main(argc, argv)
if (rtc == CVT_OK)
{
/* We are only supplied two digits of the year, by the
* clock, so we'll just print two digits.
*/
printf("%s, %2d:%02d:%02d, %d.%02d.%02d, <%s%s%s%s>",
wday[clock.wday],
(int)clock.hour, (int)clock.minute, (int)i, (int)clock.day, (int)clock.month,