From: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
Date: Tue, 18 Dec 2018 22:13:55 +0000 (+0100)
Subject: Y2038: add function __ctime64_r
X-Git-Tag: glibc-2.29~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4c2836ada90259e4c5632f962dfcda54ac448fa;p=thirdparty%2Fglibc.git

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 9b345fad4dd..7caa73eabb4 100644
--- 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 34d9de126bc..a10a59a6281 100644
--- 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 c111146d76d..38be6789f10 100644
--- 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