mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
Update.
1998-11-03 Ulrich Drepper <drepper@cygnus.com> * time/mktime.c (__mktime_internal): Handle broken down times around the time of the DST switches more correctly. 1998-11-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/netatalk/at.h: Include <linux/atalk.h> before <sys/socket.h> to make sockaddr_at available to <sys/socket.h>. 1998-11-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * time/tzset.c (tz_compute): Remove unused parameter timer. Change caller. 1998-11-02 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/generic/bits/types.h (__ipc_pid_t): New typedef.
This commit is contained in:
parent
e254df14d5
commit
5fea58fbe8
@ -1,3 +1,8 @@
|
||||
1998-11-03 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* time/mktime.c (__mktime_internal): Handle broken down times
|
||||
around the time of the DST switches more correctly.
|
||||
|
||||
1998-11-02 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* elf/Makefile (libdl-routines): Add dlopenold.
|
||||
|
@ -350,29 +350,44 @@ __mktime_internal (tp, convert, offset)
|
||||
|
||||
/* If we have a match, check whether tm.tm_isdst has the requested
|
||||
value, if any. */
|
||||
if (dt == 0 && 0 <= isdst && 0 <= tm.tm_isdst)
|
||||
if (dt == 0 && isdst >= 0 && isdst != tm.tm_isdst)
|
||||
{
|
||||
int dst_diff = (isdst != 0) - (tm.tm_isdst != 0);
|
||||
if (dst_diff)
|
||||
{
|
||||
/* Move two hours in the direction indicated by the disagreement,
|
||||
/* Move three hours in the direction indicated by the disagreement,
|
||||
probe some more, and switch to a new time if found.
|
||||
The largest known fallback due to daylight savings is two hours:
|
||||
once, in Newfoundland, 1988-10-30 02:00 -> 00:00. */
|
||||
time_t ot = t - 2 * 60 * 60 * dst_diff;
|
||||
once, in Newfoundland, 1988-10-30 02:00 -> 00:00.
|
||||
But some programs (e.g. testsuites) probe for larger differences
|
||||
between DST and normal time so switch by three hours. No
|
||||
normal program does this so we do not account for more than
|
||||
three hours difference. */
|
||||
time_t ot = t - 3 * 60 * 60 * dst_diff;
|
||||
struct tm otm;
|
||||
struct tm tmptm;
|
||||
|
||||
otm.tm_isdst = -1;
|
||||
|
||||
while (--remaining_probes != 0)
|
||||
{
|
||||
struct tm otm;
|
||||
if (! (dt = ydhms_tm_diff (year, yday, hour, min, sec,
|
||||
ranged_convert (convert, &ot, &otm))))
|
||||
{
|
||||
t = ot;
|
||||
tm = otm;
|
||||
break;
|
||||
}
|
||||
if ((ot += dt) == t)
|
||||
ranged_convert (convert, &ot,
|
||||
&tmptm)))
|
||||
|| tmptm.tm_isdst != isdst)
|
||||
break;
|
||||
|
||||
otm = tmptm;
|
||||
ot += dt;
|
||||
if (ot == t)
|
||||
break; /* Avoid a redundant probe. */
|
||||
}
|
||||
|
||||
if (otm.tm_isdst != -1)
|
||||
{
|
||||
t = ot;
|
||||
tm = otm;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user