Y2038: add function __ctime64_r

Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu.

	* include/time.h
	(__ctime64_r): Add.
	* time/ctime_r.c
	(__ctime64_r): Add.
	[__TIMESIZE != 64] (__ctime_r): Turn into a wrapper.

diff --git a/ChangeLog b/ChangeLog
index 9b345fad4dd5e7a39329ca47f2d77466d14707d7..7caa73eabb41c166201978ef0f3f068e17f3298b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-12-18  Albert ARIBAUD <albert.aribaud@3adev.fr>
 
+       * include/time.h
+       (__ctime64_r): Add.
+       * time/ctime_r.c
+       (__ctime64_r): Add.
+       [__TIMESIZE != 64] (__ctime_r): Turn into a wrapper.
+
        * include/time.h
        (__ctime64): Add.
        * time/gmtime.c

diff --git a/include/time.h b/include/time.h
index 34d9de126bc617ee52273f35acdc7195b7c554e7..a10a59a6281816a68bfee28e3fc82a4762f2a3bc 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -64,6 +64,14 @@ extern char *__ctime64 (const __time64_t *__timer) __THROW;
 libc_hidden_proto (__ctime64);
 #endif
 
+#if __TIMESIZE == 64
+# define __ctime64_r ctime_r
+#else
+extern char *__ctime64_r (const __time64_t *__restrict __timer,
+                         char *__restrict __buf) __THROW;
+libc_hidden_proto (__ctime64_r);
+#endif
+
 #if __TIMESIZE == 64
 # define __localtime64 localtime
 #else

diff --git a/time/ctime_r.c b/time/ctime_r.c
index c111146d76d9ea502ad96d2960c62387fe8f1901..38be6789f107b82c89fc0bd30af7aa3d27bf01fd 100644 (file)
--- a/time/ctime_r.c
+++ b/time/ctime_r.c
@@ -22,8 +22,23 @@
 /* Return a string as returned by asctime which is the representation
    of *T in that form.  Reentrant version.  */
 char *
-ctime_r (const time_t *t, char *buf)
+__ctime64_r (const __time64_t *t, char *buf)
 {
   struct tm tm;
-  return __asctime_r (__localtime_r (t, &tm), buf);
+  return __asctime_r (__localtime64_r (t, &tm), buf);
+}
+
+/* Provide a 32-bit variant if needed.  */
+
+#if __TIMESIZE != 64
+
+libc_hidden_def (__ctime64_r)
+
+char *
+ctime_r (const time_t *t, char *buf)
+{
+  __time64_t t64 = *t;
+  return __ctime64_r (&t64, buf);
 }
+
+#endif