Y2038: add function __gmtime64_r

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

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

diff --git a/ChangeLog b/ChangeLog
index fe1b8fcec6de02570d16af5550dd15b43278350b..5dfc488554e0a307a29f25ac8da583a3cea2b053 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-12-18  Albert ARIBAUD <albert.aribaud@3adev.fr>
 
+       * include/time.h
+       (__gmtime64_r): Add.
+       * time/gmtime.c
+       (__gmtime64_r): Add.
+       [__TIMESIZE != 64] (__gmtime): Turn into a wrapper.
+
        * include/time.h
        (__gmtime64): Add.
        * time/gmtime.c

diff --git a/include/time.h b/include/time.h
index c5881acf9f5bbc6987114063ba0f7329abaef64a..fb93d647d8c89bd972b8243a537c2ba6b757d311 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -86,6 +86,14 @@ extern struct tm *__gmtime64 (const __time64_t *__timer);
 libc_hidden_proto (__gmtime64)
 #endif
 
+#if __TIMESIZE == 64
+# define __gmtime64_r __gmtime_r
+#else
+extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer,
+                               struct tm *__restrict __tp);
+libc_hidden_proto (__gmtime64_r);
+#endif
+
 /* Compute the `struct tm' representation of T,
    offset OFFSET seconds east of UTC,
    and store year, yday, mon, mday, wday, hour, min, sec into *TP.

diff --git a/time/gmtime.c b/time/gmtime.c
index ee901c3ba1fa8ca5043bb4e543f369bc32bc8845..dff50f012fe233855a8be64c0c969253a3486f9d 100644 (file)
--- a/time/gmtime.c
+++ b/time/gmtime.c
@@ -21,10 +21,26 @@
 /* Return the `struct tm' representation of *T in UTC,
    using *TP to store the result.  */
 struct tm *
-__gmtime_r (const time_t *t, struct tm *tp)
+__gmtime64_r (const __time64_t *t, struct tm *tp)
 {
   return __tz_convert (*t, 0, tp);
 }
+
+/* Provide a 32-bit variant if needed.  */
+
+#if __TIMESIZE != 64
+
+libc_hidden_def (__gmtime64_r)
+
+struct tm *
+__gmtime_r (const time_t *t, struct tm *tp)
+{
+  __time64_t t64 = *t;
+  return __gmtime64_r (&t64, tp);
+}
+
+#endif
+
 libc_hidden_def (__gmtime_r)
 weak_alias (__gmtime_r, gmtime_r)