diff options
Diffstat (limited to 'time/mktime.c')
-rw-r--r-- | time/mktime.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/time/mktime.c b/time/mktime.c index 00f0dec6b4..2e0c467147 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -49,6 +49,7 @@ # define LEAP_SECONDS_POSSIBLE 1 #endif +#include <errno.h> #include <time.h> #include <limits.h> @@ -435,7 +436,10 @@ __mktime_internal (struct tm *tp, useful than returning -1. */ goto offset_found; else if (--remaining_probes == 0) - return -1; + { + __set_errno (EOVERFLOW); + return -1; + } /* We have a match. Check whether tm.tm_isdst has the requested value, if any. */ @@ -507,7 +511,10 @@ __mktime_internal (struct tm *tp, if (INT_ADD_WRAPV (t, sec_adjustment, &t) || ! (mktime_min <= t && t <= mktime_max) || ! convert_time (convert, t, &tm)) - return -1; + { + __set_errno (EOVERFLOW); + return -1; + } } *tp = tm; @@ -522,13 +529,12 @@ __mktime_internal (struct tm *tp, time_t mktime (struct tm *tp) { +# if defined _LIBC || NEED_MKTIME_WORKING + static mktime_offset_t localtime_offset; /* POSIX.1 8.1.1 requires that whenever mktime() is called, the time zone names contained in the external variable 'tzname' shall be set as if the tzset() function had been called. */ __tzset (); - -# if defined _LIBC || NEED_MKTIME_WORKING - static mktime_offset_t localtime_offset; return __mktime_internal (tp, __localtime_r, &localtime_offset); # else # undef mktime |