diff mbox

[4/5] Y2038: add function __ctime64

Message ID 20181217220429.4599-5-albert.aribaud@3adev.fr
State New, archived
Headers

Commit Message

Albert ARIBAUD Dec. 17, 2018, 10:04 p.m. UTC 
  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.
---
 include/time.h |  6 ++++++
 time/ctime.c   | 17 +++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/include/time.h b/include/time.h
index 80543e3673..dce17b1a71 100644
--- a/include/time.h
+++ b/include/time.h
@@ -57,6 +57,12 @@  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;
+#endif
+
 #if __TIMESIZE == 64
 # define __localtime64 localtime
 #else
diff --git a/time/ctime.c b/time/ctime.c
index 1222614f29..9c51430a37 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 variant if needed */
+
+#if __TIMESIZE != 64
+
+char *
+ctime (const time_t *t)
+{
+  __time64_t t64 = *t;
+  return __ctime64 (&t64);
+}
+
+#endif