This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
[glibc] y2038: linux: Provide __futimens64 implementation
- From: Lukasz Majewski <lukma at sourceware dot org>
- To: glibc-cvs at sourceware dot org
- Date: 2 Nov 2019 07:43:00 -0000
- Subject: [glibc] y2038: linux: Provide __futimens64 implementation
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=42893aa38fd6041d349ea0427c4d5ccbacd9a2be
commit 42893aa38fd6041d349ea0427c4d5ccbacd9a2be
Author: Lukasz Majewski <lukma@denx.de>
Date: Thu Oct 24 14:34:46 2019 +0200
y2038: linux: Provide __futimens64 implementation
This patch provides new __futimens64 explicit 64 bit function for
setting access and modification time of file (by using its file descriptor).
Moreover, a 32 bit version - __futimens has been refactored to internally use
__futimens64.
The __futimens is now supposed to be used on systems still supporting
32 bit time (__TIMESIZE != 64) - hence the necessary conversions to 64 bit
struct __timespec64.
When pointer to struct __timespec64 is NULL - the file access and modification
time is set to the current one (by the kernel) and no conversions from struct
timespec to __timespec64 are performed.
The __futimens64 reuses __utimensat64_helper defined for __utimensat64.
The test procedure for __futimens64 is the same as for __utimensat64 conversion
patch.
Diff:
---
include/time.h | 7 +++++++
sysdeps/unix/sysv/linux/futimens.c | 22 +++++++++++++++++++---
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/include/time.h b/include/time.h
index 7debf9f..8ac58e8 100644
--- a/include/time.h
+++ b/include/time.h
@@ -158,6 +158,13 @@ extern int __utimensat64_helper (int fd, const char *file,
const struct __timespec64 tsp[2], int flags);
libc_hidden_proto (__utimensat64_helper);
+#if __TIMESIZE == 64
+# define __futimens64 __futimens
+#else
+extern int __futimens64 (int fd, const struct __timespec64 tsp[2]);
+libc_hidden_proto (__futimens64);
+#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/sysdeps/unix/sysv/linux/futimens.c b/sysdeps/unix/sysv/linux/futimens.c
index 1f233d1..15fc43b 100644
--- a/sysdeps/unix/sysv/linux/futimens.c
+++ b/sysdeps/unix/sysv/linux/futimens.c
@@ -29,10 +29,26 @@
Starting with 2.6.22 the Linux kernel has the utimensat syscall which
can be used to implement futimens. */
int
-futimens (int fd, const struct timespec tsp[2])
+__futimens64 (int fd, const struct __timespec64 tsp64[2])
{
if (fd < 0)
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EBADF);
- /* Avoid implicit array coercion in syscall macros. */
- return INLINE_SYSCALL (utimensat, 4, fd, NULL, &tsp[0], 0);
+
+ return __utimensat64_helper (fd, NULL, &tsp64[0], 0);
+}
+
+#if __TIMESIZE != 64
+int
+__futimens (int fd, const struct timespec tsp[2])
+{
+ struct __timespec64 tsp64[2];
+ if (tsp)
+ {
+ tsp64[0] = valid_timespec_to_timespec64 (tsp[0]);
+ tsp64[1] = valid_timespec_to_timespec64 (tsp[1]);
+ }
+
+ return __futimens64 (fd, tsp ? &tsp64[0] : NULL);
}
+#endif
+weak_alias (__futimens, futimens)