y2038: linux: Provide __futimesat64 implementation

This conversion patch for supporting 64 bit time for futimesat only differs
from the work performed for futimes (when providing __futimes64) with passing
also the file name (and path) to utimensat.

All the design and conversion decisions are exactly the same as for futimens
conversion.

diff --git a/include/time.h b/include/time.h
index 033be25fb0972c7ef26931368a0729d012613b24..00b80eef003625798c30e4581a4e55c189d15b2a 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -207,11 +207,15 @@ libc_hidden_proto (__utimensat64_helper);
 
 #if __TIMESIZE == 64
 # define __futimes64 __futimes
+# define __futimesat64 __futimesat
 # define __lutimes64 __lutimes
 # define __futimens64 __futimens
 #else
 extern int __futimes64 (int fd, const struct __timeval64 tvp64[2]);
 libc_hidden_proto (__futimes64);
+extern int __futimesat64 (int fd, const char *file,
+                          const struct __timeval64 tvp[2]);
+libc_hidden_proto (__futimesat64);
 extern int __lutimes64 (const char *file, const struct __timeval64 tvp64[2]);
 libc_hidden_proto (__lutimes64);
 extern int __futimens64 (int fd, const struct __timespec64 tsp[2]);

diff --git a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c
index 6388a269df962edd3a6c2e0318597b572c1c51dd..f686c58fa98ecfbdbf5fafd6892d2285ee4e5115 100644 (file)
--- a/sysdeps/unix/sysv/linux/futimesat.c
+++ b/sysdeps/unix/sysv/linux/futimesat.c
@@ -17,23 +17,38 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <utime.h>
-#include <sys/time.h>
-#include <sysdep.h>
-
+#include <time.h>
 
 /* Change the access time of FILE relative to FD to TVP[0] and
    the modification time of FILE to TVP[1].  */
 int
-futimesat (int fd, const char *file, const struct timeval tvp[2])
+__futimesat64 (int fd, const char *file, const struct __timeval64 tvp64[2])
+{
+  struct __timespec64 ts64[2];
+  if (tvp64 != NULL)
+    {
+      ts64[0] = timeval64_to_timespec64 (tvp64[0]);
+      ts64[1] = timeval64_to_timespec64 (tvp64[1]);
+    }
+
+  return __utimensat64_helper (fd, file, tvp64 ? &ts64[0] : NULL, 0);
+}
+
+#if __TIMESIZE != 64
+libc_hidden_def (__futimesat64)
+
+int
+__futimesat (int fd, const char *file, const struct timeval tvp[2])
 {
-  if (file == NULL)
-    return __futimes (fd, tvp);
+  struct __timeval64 tv64[2];
+
+  if (tvp != NULL)
+    {
+      tv64[0] = valid_timeval_to_timeval64 (tvp[0]);
+      tv64[1] = valid_timeval_to_timeval64 (tvp[1]);
+    }
 
-  /* Avoid implicit array coercion in syscall macros.  */
-  return INLINE_SYSCALL (futimesat, 3, fd, file, &tvp[0]);
+  return __futimesat64 (fd, file, tvp ? &tv64[0] : NULL);
 }
+#endif
+weak_alias (__futimesat, futimesat)