kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* time.c (find_time_t): fix Time.local(2009,2,31) failure on 64bit

Browse source 
time_t environment.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-07-05 15:11:27 +00:00
parent b50cc1fe57
commit b5279bb551
2 changed files with 63 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jul 5 23:55:57 2009 Tanaka Akira <akr@fsij.org>
* time.c (find_time_t): fix Time.local(2009,2,31) failure on 64bit
time_t environment.
Sun Jul 5 22:43:13 2009 Tadayoshi Funaba <tadf@dotrb.org> Sun Jul 5 22:43:13 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (nucomp_s_polar): now arg is optional. * complex.c (nucomp_s_polar): now arg is optional.

68
time.c
View file

@ -1887,7 +1887,7 @@ static const char *
find_time_t(struct tm *tptr, int utc_p, time_t *tp) find_time_t(struct tm *tptr, int utc_p, time_t *tp)
{ {
time_t guess, guess0, guess_lo, guess_hi; time_t guess, guess0, guess_lo, guess_hi;
struct tm *tm, tm_lo, tm_hi; struct tm *tm, tm0, tm_lo, tm_hi;
int d; int d;
int find_dst; int find_dst;
struct tm result; struct tm result;
@ -1895,19 +1895,67 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp)
#define GUESS(p) (DEBUG_FIND_TIME_NUMGUESS_INC (utc_p ? gmtime_with_leapsecond(p, &result) : LOCALTIME(p, result))) #define GUESS(p) (DEBUG_FIND_TIME_NUMGUESS_INC (utc_p ? gmtime_with_leapsecond(p, &result) : LOCALTIME(p, result)))
guess_lo = TIMET_MIN;
guess_hi = TIMET_MAX;
find_dst = 0 < tptr->tm_isdst; find_dst = 0 < tptr->tm_isdst;
#ifdef NEGATIVE_TIME_T tm0 = *tptr;
guess_lo = (time_t)~((unsigned_time_t)~(time_t)0 >> 1); if (tm0.tm_mon < 0) {
#else tm0.tm_mon = 0;
guess_lo = 0; tm0.tm_mday = 1;
#endif tm0.tm_hour = 0;
guess_hi = ((time_t)-1) < ((time_t)0) ? tm0.tm_min = 0;
(time_t)((unsigned_time_t)~(time_t)0 >> 1) : tm0.tm_sec = 0;
~(time_t)0; }
else if (11 < tm0.tm_mon) {
tm0.tm_mon = 11;
tm0.tm_mday = 31;
tm0.tm_hour = 23;
tm0.tm_min = 59;
tm0.tm_sec = 60;
}
else if (tm0.tm_mday < 1) {
tm0.tm_mday = 1;
tm0.tm_hour = 0;
tm0.tm_min = 0;
tm0.tm_sec = 0;
}
else if ((d = (leap_year_p(1900 + tm0.tm_year) ?
leap_year_days_in_month :
common_year_days_in_month)[tm0.tm_mon]) < tm0.tm_mday) {
tm0.tm_mday = d;
tm0.tm_hour = 23;
tm0.tm_min = 59;
tm0.tm_sec = 60;
}
else if (tm0.tm_hour < 0) {
tm0.tm_hour = 0;
tm0.tm_min = 0;
tm0.tm_sec = 0;
}
else if (23 < tm0.tm_hour) {
tm0.tm_hour = 23;
tm0.tm_min = 59;
tm0.tm_sec = 60;
}
else if (tm0.tm_min < 0) {
tm0.tm_min = 0;
tm0.tm_sec = 0;
}
else if (59 < tm0.tm_min) {
tm0.tm_min = 59;
tm0.tm_sec = 60;
}
else if (tm0.tm_sec < 0) {
tm0.tm_sec = 0;
}
else if (60 < tm0.tm_sec) {
tm0.tm_sec = 60;
}
DEBUG_REPORT_GUESSRANGE; DEBUG_REPORT_GUESSRANGE;
guess0 = guess = timegm_noleapsecond(tptr); guess0 = guess = timegm_noleapsecond(&tm0);
tm = GUESS(&guess); tm = GUESS(&guess);
if (tm) { if (tm) {
d = tmcmp(tptr, tm); d = tmcmp(tptr, tm);