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

Y2038: add function __ctime64

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

	* include/time.h
	(__ctime64): Add.
	* time/gmtime.c
	(__ctime64): Add.
	[__TIMESIZE != 64] (ctime): Turn into a wrapper.
---

diff --git a/ChangeLog b/ChangeLog
index 5dfc488554e..9b345fad4dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-12-18  Albert ARIBAUD <albert.aribaud@3adev.fr>
 
+	* include/time.h
+	(__ctime64): Add.
+	* time/gmtime.c
+	(__ctime64): Add.
+	[__TIMESIZE != 64] (ctime): Turn into a wrapper.
+
 	* include/time.h
 	(__gmtime64_r): Add.
 	* time/gmtime.c
diff --git a/include/time.h b/include/time.h
index fb93d647d8c..34d9de126bc 100644
--- a/include/time.h
+++ b/include/time.h
@@ -57,6 +57,13 @@ extern time_t __mktime_internal (struct tm *__tp,
 						       struct tm *),
 				 long int *__offset) attribute_hidden;
 
+#if __TIMESIZE == 64
+# define __ctime64 ctime
+#else
+extern char *__ctime64 (const __time64_t *__timer) __THROW;
+libc_hidden_proto (__ctime64);
+#endif
+
 #if __TIMESIZE == 64
 # define __localtime64 localtime
 #else
diff --git a/time/ctime.c b/time/ctime.c
index 1222614f295..7925662a0a1 100644
--- a/time/ctime.c
+++ b/time/ctime.c
@@ -20,9 +20,24 @@
 /* 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 variant if needed.  */
+
+#if __TIMESIZE != 64
+
+libc_hidden_def (__ctime64)
+
+char *
+ctime (const time_t *t)
+{
+  __time64_t t64 = *t;
+  return __ctime64 (&t64);
 }
+
+#endif