about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlbert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>2018-12-18 23:13:24 +0100
committerAlbert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>2018-12-18 23:13:24 +0100
commit7755e504117cc014416a60f8498f3f15b14d6482 (patch)
tree25222b8a79f9375cf5a9c4ebbe9a301f5b3335a4
parenta1d346ce0d6e93bd48638ad57a11e37afacdc80f (diff)
downloadglibc-7755e504117cc014416a60f8498f3f15b14d6482.tar.gz
glibc-7755e504117cc014416a60f8498f3f15b14d6482.tar.xz
glibc-7755e504117cc014416a60f8498f3f15b14d6482.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--include/time.h7
-rw-r--r--time/ctime.c19
3 files changed, 30 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dfc488554..9b345fad4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 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
 	(__gmtime64_r): Add.
diff --git a/include/time.h b/include/time.h
index fb93d647d8..34d9de126b 100644
--- a/include/time.h
+++ b/include/time.h
@@ -58,6 +58,13 @@ extern time_t __mktime_internal (struct tm *__tp,
 				 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
 extern struct tm *__localtime64 (const __time64_t *__timer);
diff --git a/time/ctime.c b/time/ctime.c
index 1222614f29..7925662a0a 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