Mercurial > hg > octave-lyh > gnulib-hg
changeset 4018:ad164b161300
Merge in changes from libc.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sun, 24 Nov 2002 10:39:54 +0000 |
parents | cc301544e3db |
children | 0be9c5597ddd |
files | lib/mktime.c |
diffstat | 1 files changed, 34 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/mktime.c +++ b/lib/mktime.c @@ -52,6 +52,7 @@ # include <stdio.h> # if STDC_HEADERS # include <stdlib.h> +# include <string.h> # endif /* Make it work even if the system's libc has its own mktime routine. */ # define mktime my_mktime @@ -239,6 +240,9 @@ int year_requested = tp->tm_year; int isdst = tp->tm_isdst; + /* 1 if the previous probe was DST. */ + int dst2; + /* Ensure that mon is in range, and set year accordingly. */ int mon_remainder = mon % 12; int negative_mon_remainder = mon_remainder < 0; @@ -257,6 +261,13 @@ + mday - 1); int sec_requested = sec; + + /* Only years after 1970 are defined. + If year is 69, it might still be representable due to + timezone differences. */ + if (year < 69) + return -1; + #if LEAP_SECONDS_POSSIBLE /* Handle out-of-range seconds specially, since ydhms_tm_diff assumes every minute has 60 seconds. */ @@ -273,20 +284,24 @@ tm.tm_yday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0; t0 = ydhms_tm_diff (year, yday, hour, min, sec, &tm); - for (t = t1 = t2 = t0 + *offset; + for (t = t1 = t2 = t0 + *offset, dst2 = 0; (dt = ydhms_tm_diff (year, yday, hour, min, sec, ranged_convert (convert, &t, &tm))); - t1 = t2, t2 = t, t += dt) + t1 = t2, t2 = t, t += dt, dst2 = tm.tm_isdst != 0) if (t == t1 && t != t2 - && (isdst < 0 || tm.tm_isdst < 0 - || (isdst != 0) != (tm.tm_isdst != 0))) + && (tm.tm_isdst < 0 + || (isdst < 0 + ? dst2 <= (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. */ + tm_isdst differs from the requested value. (If no tm_isdst + was requested and only one of the two values has a nonzero + tm_isdst, prefer that value.) In practice, this is more + useful than returning -1. */ break; else if (--remaining_probes == 0) return -1; @@ -360,6 +375,14 @@ return -1; } + if (year == 69) + { + /* If year was 69, need to check whether the time was representable + or not. */ + if (t < 0 || t > 2 * 24 * 60 * 60) + return -1; + } + *tp = tm; return t; } @@ -385,6 +408,11 @@ #ifdef weak_alias weak_alias (mktime, timelocal) #endif + +#ifdef _LIBC +libc_hidden_def (mktime) +libc_hidden_weak (timelocal) +#endif #if DEBUG