AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-31 15:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
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:
Ulrich Drepper 1998-11-03 15:49:43 +00:00
parent e254df14d5
commit 5fea58fbe8
2 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 1998-11-02 Ulrich Drepper <drepper@cygnus.com>
* elf/Makefile (libdl-routines): Add dlopenold. * elf/Makefile (libdl-routines): Add dlopenold.

39
time/mktime.c
View File

@ -350,29 +350,44 @@ __mktime_internal (tp, convert, offset)
/* If we have a match, check whether tm.tm_isdst has the requested /* If we have a match, check whether tm.tm_isdst has the requested
value, if any. */ 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); int dst_diff = (isdst != 0) - (tm.tm_isdst != 0);
if (dst_diff) 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. probe some more, and switch to a new time if found.
The largest known fallback due to daylight savings is two hours: The largest known fallback due to daylight savings is two hours:
once, in Newfoundland, 1988-10-30 02:00 -> 00:00. */ once, in Newfoundland, 1988-10-30 02:00 -> 00:00.
time_t ot = t - 2 * 60 * 60 * dst_diff; 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) while (--remaining_probes != 0)
{ {
struct tm otm;
if (! (dt = ydhms_tm_diff (year, yday, hour, min, sec, if (! (dt = ydhms_tm_diff (year, yday, hour, min, sec,
ranged_convert (convert, &ot, &otm)))) ranged_convert (convert, &ot,
{ &tmptm)))
t = ot; || tmptm.tm_isdst != isdst)
tm = otm; break;
break;
} otm = tmptm;
if ((ot += dt) == t) ot += dt;
if (ot == t)
break; /* Avoid a redundant probe. */ break; /* Avoid a redundant probe. */
} }
if (otm.tm_isdst != -1)
{
t = ot;
tm = otm;
}
} }
} }