OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle leap seconds even if no DST rule exists. 

This fixes BZ #10211.
This commit is contained in:
Akinori Hattori 2009-06-15 10:54:26 -07:00 committed by Ulrich Drepper
parent c9bb324154
commit 29143408ae
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2009-06-15 Ulrich Drepper <drepper@redhat.com>
[BZ #10211]
* time/tzfile.c (__tzfile_compute): If we use the envvar format still
handle leap seconds if they are available.
Patch by Akinori Hattori <hattya@gentoo.org>.
* timezone/tzselect.ksh: Update from tzcode2009i.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.

7
time/tzfile.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-1993,1995-2001,2003,2004,2006, 2007
/* Copyright (C) 1991-1993,1995-2001,2003,2004,2006,2007,2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -659,9 +659,7 @@ __tzfile_compute (time_t timer, int use_localtime,
__tzname[1] = __tzstring (&zone_names[strlen (zone_names) + 1]);
}
*leap_correct = 0L;
*leap_hit = 0;
return;
goto leap;
}
else
{
@ -762,6 +760,7 @@ __tzfile_compute (time_t timer, int use_localtime,
tp->tm_gmtoff = info->offset;
}
leap:
*leap_correct = 0L;
*leap_hit = 0;