mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 02:03:35 +08:00
Fix handling of turnaround times.
This commit is contained in:
parent
988cca3323
commit
3af64d740a
@ -1,6 +1,6 @@
|
||||
#ifndef lint
|
||||
#ifndef NOID
|
||||
static char elsieid[] = "@(#)zic.c 7.102";
|
||||
static char elsieid[] = "@(#)zic.c 7.104";
|
||||
#endif /* !defined NOID */
|
||||
#endif /* !defined lint */
|
||||
|
||||
@ -1616,16 +1616,16 @@ const int zonecount;
|
||||
typecnt = 0;
|
||||
charcnt = 0;
|
||||
/*
|
||||
** A guess that may well be corrected later.
|
||||
*/
|
||||
stdoff = 0;
|
||||
/*
|
||||
** Thanks to Earl Chew (earl@dnd.icp.nec.com.au)
|
||||
** for noting the need to unconditionally initialize startttisstd.
|
||||
*/
|
||||
startttisstd = FALSE;
|
||||
startttisgmt = FALSE;
|
||||
for (i = 0; i < zonecount; ++i) {
|
||||
/*
|
||||
** A guess that may well be corrected later.
|
||||
*/
|
||||
stdoff = 0;
|
||||
zp = &zpfirst[i];
|
||||
usestart = i > 0 && (zp - 1)->z_untiltime > min_time;
|
||||
useuntil = i < (zonecount - 1);
|
||||
@ -1645,8 +1645,7 @@ const int zonecount;
|
||||
if (usestart) {
|
||||
addtt(starttime, type);
|
||||
usestart = FALSE;
|
||||
}
|
||||
else if (stdoff != 0)
|
||||
} else if (stdoff != 0)
|
||||
addtt(min_time, type);
|
||||
} else for (year = min_year; year <= max_year; ++year) {
|
||||
if (useuntil && year > zp->z_untilrule.r_hiyear)
|
||||
|
Loading…
Reference in New Issue
Block a user