diff options
author | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2018-06-18 21:14:43 +0200 |
---|---|---|
committer | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2018-10-10 00:21:43 +0200 |
commit | 7d82403ed8b6361e362ee8fbf4c3b316e26268dc (patch) | |
tree | 54a0d6c8fcf4d75f7fb4303a1fdd948cc3c8b34c /time/ctime.c | |
parent | 6ccd9dd89364bccd3f9774be68232908bdbda8b9 (diff) | |
download | glibc-aaribaud/make-check.tar.gz |
Y2038: make __tz_convert compatible with 64-bit-timeaaribaud/make-check
Now that __time_64_t exists, we can switch internal function
__tz_convert from 32-bit to 64-bit time. This involves switching
some other internal functions and turning some implementations
which use these into wrappers between public 32-bit and internal
64-bit time.
* __tz_compute: Pass timer as a __time64_t rather than time_t.
* __offtime: Pass __timer as a __time64_t value rather than
a const time_t pointer.
* __tz_convert: Likewise.
* localtime: provide a 64-bit time version and make the 32-bit
time version a wrapper of it.
* localtime_r: Likewise.
* ctime: Likewise.
* ctime_r: Likewise.
* gmtime: Likewise.
* gmtime_r: Likewise.
Diffstat (limited to 'time/ctime.c')
-rw-r--r-- | time/ctime.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/time/ctime.c b/time/ctime.c index 1222614f29..286c6b579c 100644 --- a/time/ctime.c +++ b/time/ctime.c @@ -20,9 +20,22 @@ /* Return a string as returned by asctime which is the representation of *T in that form. */ char * -ctime (const time_t *t) +__ctime64 (const __time64_t *t) { /* The C Standard says ctime (t) is equivalent to asctime (localtime (t)). In particular, ctime and asctime must yield the same pointer. */ - return asctime (localtime (t)); + return asctime (__localtime64 (t)); } + +/* Provide a 32-bit wrapper if needed */ + +#if __TIMESIZE != 64 + +char * +ctime (const time_t *t) +{ + __time64_t t64 = *t; + return __ctime64 (&t64); +} + +#endif |