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

Update. 

1998-10-08  Paul Eggert  <eggert@twinsun.com>

	* time/mktime.c (__mktime_internal): When the requested time falls
	in a spring-forward gap of size DT, return a time that is DT away
	from the requested time, preferring a time whose tm_isdst differs
	from the requested value.  Bump the max number of probes from 4 to
	6 to account for the extra probes needed to discover a
	spring-forward gap in the worst case.

1998-10-07 17:05  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/alpha/ioperm.c: Improve the autodetection
	of the weird alpha architectures.
	Patch by Cristian Gafton <gafton@redhat.com>.

1998-02-18 23:31  Richard Henderson  <rth@cygnus.com>

	* sysdeps/unix/sysv/linux/alpha/ioperm.c: Add support for
	RAWHIDE and TSUNAMI.  Patch from Jay.Estabrook@digital.com.
This commit is contained in:
Ulrich Drepper 1998-10-08 11:48:03 +00:00
parent 604510f717
commit 25b3b17b20
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
1998-10-08 Paul Eggert <eggert@twinsun.com>
* time/mktime.c (__mktime_internal): When the requested time falls
in a spring-forward gap of size DT, return a time that is DT away
from the requested time, preferring a time whose tm_isdst differs
from the requested value. Bump the max number of probes from 4 to
6 to account for the extra probes needed to discover a
spring-forward gap in the worst case.
1998-10-07 17:05 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/alpha/ioperm.c: Improve the autodetection
of the weird alpha architectures.
Patch by Cristian Gafton <gafton@redhat.com>.
1998-02-18 23:31 Richard Henderson <rth@cygnus.com>
* sysdeps/unix/sysv/linux/alpha/ioperm.c: Add support for
RAWHIDE and TSUNAMI. Patch from Jay.Estabrook@digital.com.
1998-10-07 Ulrich Drepper <drepper@cygnus.com> 1998-10-07 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-open.c (_dl_global_scope_alloc): Make global. * elf/dl-open.c (_dl_global_scope_alloc): Make global.

30
time/mktime.c
View File

@ -256,14 +256,14 @@ __mktime_internal (tp, convert, offset)
struct tm *(*convert) __P ((const time_t *, struct tm *)); struct tm *(*convert) __P ((const time_t *, struct tm *));
time_t *offset; time_t *offset;
{ {
time_t t, dt, t0; time_t t, dt, t0, t1, t2;
struct tm tm; struct tm tm;
/* The maximum number of probes (calls to CONVERT) should be enough /* The maximum number of probes (calls to CONVERT) should be enough
to handle any combinations of time zone rule changes, solar time, to handle any combinations of time zone rule changes, solar time,
and leap seconds. POSIX.1 prohibits leap seconds, but some hosts leap seconds, and oscillations around a spring-forward gap.
have them anyway. */ POSIX.1 prohibits leap seconds, but some hosts have them anyway. */
int remaining_probes = 4; int remaining_probes = 6;
/* Time requested. Copy it in case CONVERT modifies *TP; this can /* Time requested. Copy it in case CONVERT modifies *TP; this can
occur if TP is localtime's returned value and CONVERT is localtime. */ occur if TP is localtime's returned value and CONVERT is localtime. */
@ -309,15 +309,27 @@ __mktime_internal (tp, convert, offset)
tm.tm_yday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0; tm.tm_yday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
t0 = ydhms_tm_diff (year, yday, hour, min, sec, &tm); t0 = ydhms_tm_diff (year, yday, hour, min, sec, &tm);
for (t = t0 + *offset; for (t = t1 = t2 = t0 + *offset;
(dt = ydhms_tm_diff (year, yday, hour, min, sec, (dt = ydhms_tm_diff (year, yday, hour, min, sec,
ranged_convert (convert, &t, &tm))); ranged_convert (convert, &t, &tm)));
t += dt) t1 = t2, t2 = t, t += dt)
if (--remaining_probes == 0) if (t == t1 && t != t2
&& (isdst < 0 || tm.tm_isdst < 0
|| (isdst != 0) != (tm.tm_isdst != 0)))
/* We can't possibly find a match, as we are oscillating
between two values. The requested time probably falls
within a spring-forward gap of size DT. Follow the common
practice in this case, which is to return a time that is DT
away from the requested time, preferring a time whose
tm_isdst differs from the requested value. In practice,
this is more useful than returning -1. */
break;
else if (--remaining_probes == 0)
return -1; return -1;
/* Check whether tm.tm_isdst has the requested value, if any. */ /* If we have a match, check whether tm.tm_isdst has the requested
if (0 <= isdst && 0 <= tm.tm_isdst) value, if any. */
if (dt == 0 && 0 <= isdst && 0 <= 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)