qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(tz_compute): If time to switch to DST is later in the year switch back in the next year.

This commit is contained in:
Ulrich Drepper 1998-10-25 22:10:12 +00:00
parent a825f8e844
commit 896ebd6bf6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
time/tzset.c
View File

@ -517,9 +517,20 @@ tz_compute (timer, tm)
time_t timer; time_t timer;
const struct tm *tm; const struct tm *tm;
{ {
if (! compute_change (&tz_rules[0], 1900 + tm->tm_year) || if (! compute_change (&tz_rules[0], 1900 + tm->tm_year))
! compute_change (&tz_rules[1], 1900 + tm->tm_year))
return 0; return 0;
/* We have to distinguish between northern and southern hemisphere.
For the later the daylight saving time ends in the next year. */
if (tz_rules[0].change < tz_rules[1].change)
{
if (! compute_change (&tz_rules[1], 1900 + tm->tm_year))
return 0;
}
else
{
if (! compute_change (&tz_rules[1], 1900 + tm->tm_year + 1))
return 0;
}
__daylight = tz_rules[0].offset != tz_rules[1].offset; __daylight = tz_rules[0].offset != tz_rules[1].offset;
__timezone = -tz_rules[0].offset; __timezone = -tz_rules[0].offset;