[PATCH 4/5] Y2038: add function __ctime64

[PATCH 4/5] Y2038: add function __ctime64

[Albert ARIBAUD (3ADEV)]

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 --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
-- 
2.17.1

[PATCH 2/5] Y2038: add function __gmtime64

[Albert ARIBAUD (3ADEV)]

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

	* include/time.h
	(__gmtime64): Add.
	* time/gmtime.c
	(__gmtime64): Add.
	[__TIMESIZE != 64] (__gmtime): Turn into a wrapper.
---
 include/time.h |  4 ++++
 time/gmtime.c  | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/include/time.h b/include/time.h
index 34368295a9..553bf74828 100644
--- a/include/time.h
+++ b/include/time.h
@@ -78,6 +78,10 @@ extern struct tm *__gmtime_r (const time_t *__restrict __timer,
 			      struct tm *__restrict __tp);
 libc_hidden_proto (__gmtime_r)
 
+#if __TIMESIZE == 64
+# define __gmtime64 gmtime
+#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 bda09bc021..67fdc89296 100644
--- a/time/gmtime.c
+++ b/time/gmtime.c
@@ -25,13 +25,26 @@ __gmtime_r (const time_t *t, struct tm *tp)
 {
   return __tz_convert (*t, 0, tp);
 }
+
 libc_hidden_def (__gmtime_r)
 weak_alias (__gmtime_r, gmtime_r)
 
+/* Return the `struct tm' representation of *T in UTC.  */
+struct tm *
+__gmtime64 (const __time64_t *t)
+{
+  return __tz_convert (*t, 0, &_tmbuf);
+}
+
+/* Provide a 32-bit variant if needed */
+
+#if __TIMESIZE != 64
 
-/* Return the `struct tm' representation of *T in UTC.	*/
 struct tm *
 gmtime (const time_t *t)
 {
-  return __tz_convert (*t, 0, &_tmbuf);
+  __time64_t t64 = *t;
+  return __gmtime64 (&t64, 0, &_tmbuf);
 }
+
+#endif
-- 
2.17.1

[PATCH 3/5] Y2038: add function __gmtime64_r

[Albert ARIBAUD (3ADEV)]

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.
---
 include/time.h |  7 +++++++
 time/gmtime.c  | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/include/time.h b/include/time.h
index 553bf74828..80543e3673 100644
--- a/include/time.h
+++ b/include/time.h
@@ -82,6 +82,13 @@ libc_hidden_proto (__gmtime_r)
 # define __gmtime64 gmtime
 #endif
 
+#if __TIMESIZE == 64
+# define __gmtime64_r __gmtime_r
+#else
+extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer,
+				struct tm *__restrict __tp);
+#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 67fdc89296..0b454d4b2b 100644
--- a/time/gmtime.c
+++ b/time/gmtime.c
@@ -21,11 +21,24 @@
 /* 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
+
+struct tm *
+__gmtime_r (const time_t *t, struct tm *tp)
+{
+  __time64_t t64 = *t;
+  return __gmtime64_r (&t64, 0, tp);
+}
+
+#endif
+
 libc_hidden_def (__gmtime_r)
 weak_alias (__gmtime_r, gmtime_r)
 
-- 
2.17.1

[PATCH 1/5] Y2038: add function __localtime64_r

[Albert ARIBAUD (3ADEV)]

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

[PATCH 0/5] Y2038: process remaining struct tm conv functions

[Albert ARIBAUD (3ADEV)]

These five patches are similar to commit 6e15f3e just applied; each
one covers one function converting to or from struct tm.

Albert ARIBAUD (3ADEV) (5):
  Y2038: add function __localtime64_r
  Y2038: add function __gmtime64
  Y2038: add function __gmtime64_r
  Y2038: add function __ctime64
  Y2038: add function __ctime64_r

 include/time.h   | 31 +++++++++++++++++++++++++++++++
 time/ctime.c     | 17 +++++++++++++++--
 time/ctime_r.c   | 17 +++++++++++++++--
 time/gmtime.c    | 32 +++++++++++++++++++++++++++++---
 time/localtime.c | 16 +++++++++++++++-
 5 files changed, 105 insertions(+), 8 deletions(-)

-- 
2.17.1

[PATCH 5/5] Y2038: add function __ctime64_r

[Albert ARIBAUD (3ADEV)]

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

	* include/time.h
	(__ctime64_r): Add.
	* time/ctime_r.c
	(__ctime64_r): Add.
	[__TIMESIZE != 64] (__ctime_r): Turn into a wrapper.
---
 include/time.h |  7 +++++++
 time/ctime_r.c | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/include/time.h b/include/time.h
index dce17b1a71..5aa00cb7fa 100644
--- a/include/time.h
+++ b/include/time.h
@@ -63,6 +63,13 @@ extern time_t __mktime_internal (struct tm *__tp,
 extern char *__ctime64 (const __time64_t *__timer) __THROW;
 #endif
 
+#if __TIMESIZE == 64
+# define __ctime64_r ctime_r
+#else
+extern char *__ctime64_r (const __time64_t *__restrict __timer,
+		          char *__restrict __buf) __THROW;
+#endif
+
 #if __TIMESIZE == 64
 # define __localtime64 localtime
 #else
diff --git a/time/ctime_r.c b/time/ctime_r.c
index c111146d76..0041fbf312 100644
--- a/time/ctime_r.c
+++ b/time/ctime_r.c
@@ -22,8 +22,21 @@
 /* Return a string as returned by asctime which is the representation
    of *T in that form.  Reentrant version.  */
 char *
-ctime_r (const time_t *t, char *buf)
+__ctime64_r (const __time64_t *t, char *buf)
 {
   struct tm tm;
-  return __asctime_r (__localtime_r (t, &tm), buf);
+  return __asctime_r (__localtime64_r (t, &tm), buf);
 }
+
+/* Provide a 32-bit variant if needed */
+
+#if __TIMESIZE != 64
+
+char *
+ctime_r (const time_t *t, char *buf)
+{
+  __time64_t t64 = *t;
+  return __ctime64_r (&t64, buf);
+}
+
+#endif
-- 
2.17.1

Re: [PATCH 2/5] Y2038: add function __gmtime64

[Paul Eggert]

On 12/17/18 2:04 PM, Albert ARIBAUD (3ADEV) wrote:
> +#if __TIMESIZE == 64
> +# define __gmtime64 gmtime
> +#endif

Why does this look different from the already-installed patch for 
__localtime64, which has the following before the #endif?

+#else
+extern struct tm *__localtime64 (const __time64_t *__timer);
+libc_hidden_proto (__localtime64)

> --- a/time/gmtime.c
> +++ b/time/gmtime.c
> @@ -25,13 +25,26 @@ __gmtime_r (const time_t *t, struct tm *tp)
>   {
>     return __tz_convert (*t, 0, tp);
>   }
> +
>   libc_hidden_def (__gmtime_r)
>   weak_alias (__gmtime_r, gmtime_r)

No need for this whitespace change.

Re: [PATCH 1/5] Y2038: add function __localtime64_r

[Joseph Myers]

On Mon, 17 Dec 2018, Albert ARIBAUD (3ADEV) wrote:

> +/* Provide a 32-bit variant if needed */

Throughout this series, please make sure comments end with ".  " (full 
stop, two spaces) before end of comment.  You have the same mistake in 
other patches in this series.

You're declaring __localtime64_r with attribute_hidden.  Although not 
strictly wrong at this stage, since the point is eventually to export it 
from libc it would be better to declare it without attribute_hidden, and 
instead use libc_hidden_proto / libc_hidden_def (those are needed because 
of the call from __localtime_r).  Otherwise you'll need to remove the 
attribute_hidden, and add the libc_hidden_*, in a later patch that exports 
or prepares to export the functions.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH 2/5] Y2038: add function __gmtime64

[Joseph Myers]

On Mon, 17 Dec 2018, Albert ARIBAUD (3ADEV) wrote:

> +  return __gmtime64 (&t64, 0, &_tmbuf);

In all these patches, the __*64 function that gets called within glibc 
should have libc_hidden_proto / libc_hidden_def used accordingly.  (This 
results in more efficient function calls on 32-bit x86 because the 
compiler knows the call is a direct call within the same shared library 
that does not need to go via the PLT.)

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH 2/5] Y2038: add function __gmtime64

[Albert ARIBAUD]

Hi Paul,

On Mon, 17 Dec 2018 14:09:01 -0800, Paul Eggert <eggert@cs.ucla.edu>
wrote :

> On 12/17/18 2:04 PM, Albert ARIBAUD (3ADEV) wrote:
> > +#if __TIMESIZE == 64
> > +# define __gmtime64 gmtime
> > +#endif  
> 
> Why does this look different from the already-installed patch for 
> __localtime64, which has the following before the #endif?
> 
> +#else
> +extern struct tm *__localtime64 (const __time64_t *__timer);
> +libc_hidden_proto (__localtime64)

Overlook, fixed in v2.

> > --- a/time/gmtime.c
> > +++ b/time/gmtime.c
> > @@ -25,13 +25,26 @@ __gmtime_r (const time_t *t, struct tm *tp)
> >   {
> >     return __tz_convert (*t, 0, tp);
> >   }
> > +
> >   libc_hidden_def (__gmtime_r)
> >   weak_alias (__gmtime_r, gmtime_r)  
> 
> No need for this whitespace change.

Ditto.

Thanks for your feedback!

Cordialement,
Albert ARIBAUD
3ADEV

Re: [PATCH 1/5] Y2038: add function __localtime64_r

[Albert ARIBAUD]

Hi Joseph,

On Mon, 17 Dec 2018 22:17:22 +0000, Joseph Myers
<joseph@codesourcery.com> wrote :

> On Mon, 17 Dec 2018, Albert ARIBAUD (3ADEV) wrote:
> 
> > +/* Provide a 32-bit variant if needed */  
> 
> Throughout this series, please make sure comments end with ".  " (full 
> stop, two spaces) before end of comment.  You have the same mistake in 
> other patches in this series.

Fixed. Is there a script that I could run on my local repo that
would check for these and which I could install as a git pre-commit
hook?

> You're declaring __localtime64_r with attribute_hidden.  Although not 
> strictly wrong at this stage, since the point is eventually to export it 
> from libc it would be better to declare it without attribute_hidden, and 
> instead use libc_hidden_proto / libc_hidden_def (those are needed because 
> of the call from __localtime_r).  Otherwise you'll need to remove the 
> attribute_hidden, and add the libc_hidden_*, in a later patch that exports 
> or prepares to export the functions.

Fixed for __localtime64_r, __gmtime64 and __gmtime64_r.

ctime and ctime_r are not called from within glibc at all and have no
libc_hidden_proto/libc_hidden_def, so I did not add any to __ctime64
and __ctime64_r.

Thanks for your feedback!

Cordialement,
Albert ARIBAUD
3ADEV

Re: [PATCH 1/5] Y2038: add function __localtime64_r

[Albert ARIBAUD]

On Tue, 18 Dec 2018 10:16:51 +0100, Albert ARIBAUD
<albert.aribaud@3adev.fr> wrote :

> ctime and ctime_r are not called from within glibc at all and have no
> libc_hidden_proto/libc_hidden_def, so I did not add any to __ctime64
> and __ctime64_r.

... but since __ctime64 is called by ctime and __ctime64_r is called by
ctime_r, in fact __ctime64 and __time64_r do need libc_hidden_proto and
libc_hidden_def.

Cordialement,
Albert ARIBAUD
3ADEV

Re: [PATCH 1/5] Y2038: add function __localtime64_r

[Joseph Myers]

On Tue, 18 Dec 2018, Albert ARIBAUD wrote:

> > On Mon, 17 Dec 2018, Albert ARIBAUD (3ADEV) wrote:
> > 
> > > +/* Provide a 32-bit variant if needed */  
> > 
> > Throughout this series, please make sure comments end with ".  " (full 
> > stop, two spaces) before end of comment.  You have the same mistake in 
> > other patches in this series.
> 
> Fixed. Is there a script that I could run on my local repo that
> would check for these and which I could install as a git pre-commit
> hook?

I am not aware of such a script.

-- 
Joseph S. Myers
joseph@codesourcery.com