diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/intrinsics/date_and_time.c | 24 | ||||
| -rw-r--r-- | libgfortran/intrinsics/time_1.h | 14 |
2 files changed, 24 insertions, 14 deletions
diff --git a/libgfortran/intrinsics/date_and_time.c b/libgfortran/intrinsics/date_and_time.c index 8213127..de40bbc 100644 --- a/libgfortran/intrinsics/date_and_time.c +++ b/libgfortran/intrinsics/date_and_time.c @@ -113,9 +113,6 @@ gmtime_r (const time_t * timep, struct tm * result) VALUES for INTEGER(kind=4) and INTEGER(kind=8). Based on libU77's date_time_.c. - - TODO : - - Check year boundaries. */ #define DATE_LEN 8 #define TIME_LEN 10 @@ -131,7 +128,7 @@ date_and_time (char *__date, char *__time, char *__zone, gfc_array_i4 *__values, GFC_INTEGER_4 __date_len, GFC_INTEGER_4 __time_len, GFC_INTEGER_4 __zone_len) { - int i; + int i, delta_day; char date[DATE_LEN + 1]; char timec[TIME_LEN + 1]; char zone[ZONE_LEN + 1]; @@ -154,9 +151,22 @@ date_and_time (char *__date, char *__time, char *__zone, values[0] = 1900 + local_time.tm_year; values[1] = 1 + local_time.tm_mon; values[2] = local_time.tm_mday; - values[3] = (local_time.tm_min - UTC_time.tm_min + - 60 * (local_time.tm_hour - UTC_time.tm_hour + - 24 * (local_time.tm_yday - UTC_time.tm_yday))); + + /* Day difference with UTC should always be -1, 0 or +1. + Near year boundaries, we may obtain a large positive (+364, + or +365 on leap years) or negative (-364, or -365 on leap years) + number, which we have to handle. + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98507 + */ + delta_day = local_time.tm_yday - UTC_time.tm_yday; + if (delta_day < -1) + delta_day = 1; + else if (delta_day > 1) + delta_day = -1; + + values[3] = local_time.tm_min - UTC_time.tm_min + + 60 * (local_time.tm_hour - UTC_time.tm_hour + 24 * delta_day); + values[4] = local_time.tm_hour; values[5] = local_time.tm_min; values[6] = local_time.tm_sec; diff --git a/libgfortran/intrinsics/time_1.h b/libgfortran/intrinsics/time_1.h index 2d238fd..b2adca0 100644 --- a/libgfortran/intrinsics/time_1.h +++ b/libgfortran/intrinsics/time_1.h @@ -213,19 +213,19 @@ gf_cputime (long *user_sec, long *user_usec, long *system_sec, long *system_usec static inline int gf_gettime (time_t * secs, long * usecs) { -#ifdef HAVE_GETTIMEOFDAY +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; + int err = clock_gettime (CLOCK_REALTIME, &ts); + *secs = ts.tv_sec; + *usecs = ts.tv_nsec / 1000; + return err; +#elif defined(HAVE_GETTIMEOFDAY) struct timeval tv; int err; err = gettimeofday (&tv, NULL); *secs = tv.tv_sec; *usecs = tv.tv_usec; return err; -#elif defined(HAVE_CLOCK_GETTIME) - struct timespec ts; - int err = clock_gettime (CLOCK_REALTIME, &ts); - *secs = ts.tv_sec; - *usecs = ts.tv_nsec / 1000; - return err; #else time_t t = time (NULL); *secs = t; |