This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 1/5] Y2038: add function __localtime64_r
- From: "Albert ARIBAUD (3ADEV)" <albert dot aribaud at 3adev dot fr>
- To: libc-alpha at sourceware dot org
- Date: Mon, 17 Dec 2018 23:04:25 +0100
- Subject: [PATCH 1/5] Y2038: add function __localtime64_r
- References: <20181217220429.4599-1-albert.aribaud@3adev.fr>
Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu.
* include/time.h
(__localtime64_r): Add.
* time/localtime.c
(__localtime64_r): Add.
[__TIMESIZE != 64] (__localtime_r): Turn into a wrapper.
---
include/time.h | 7 +++++++
time/localtime.c | 16 +++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/include/time.h b/include/time.h
index 3bc303a36e..34368295a9 100644
--- a/include/time.h
+++ b/include/time.h
@@ -67,6 +67,13 @@ libc_hidden_proto (__localtime64)
extern struct tm *__localtime_r (const time_t *__timer,
struct tm *__tp) attribute_hidden;
+#if __TIMESIZE == 64
+# define __localtime64_r __localtime_r
+#else
+extern struct tm *__localtime64_r (const __time64_t *__timer,
+ struct tm *__tp) attribute_hidden;
+#endif
+
extern struct tm *__gmtime_r (const time_t *__restrict __timer,
struct tm *__restrict __tp);
libc_hidden_proto (__gmtime_r)
diff --git a/time/localtime.c b/time/localtime.c
index 96879d4ec0..37169234c8 100644
--- a/time/localtime.c
+++ b/time/localtime.c
@@ -25,10 +25,24 @@ struct tm _tmbuf;
/* Return the `struct tm' representation of *T in local time,
using *TP to store the result. */
struct tm *
-__localtime_r (const time_t *t, struct tm *tp)
+__localtime64_r (const __time64_t *t, struct tm *tp)
{
return __tz_convert (*t, 1, tp);
}
+
+/* Provide a 32-bit variant if needed */
+
+#if __TIMESIZE != 64
+
+struct tm *
+__localtime_r (const time_t *t, struct tm *tp)
+{
+ __time64_t t64 = *t;
+ return __localtime64_r (&t64, tp);
+}
+
+#endif
+
weak_alias (__localtime_r, localtime_r)
--
2.17.1