aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Majewski <lukma@denx.de>2020-02-06 12:34:48 +0100
committerLukasz Majewski <lukma@denx.de>2020-03-03 14:28:08 +0100
commitd962a5d68a140811eb4b6cf788c41ff471fd95b4 (patch)
tree922919c437824bac8d28c3f241baa9d9c9ee8f84 /sysdeps/unix/sysv/linux
parenty2038: Introduce struct __utimbuf64 - new internal glibc type (diff)
downloadglibc-d962a5d68a140811eb4b6cf788c41ff471fd95b4.tar.gz
glibc-d962a5d68a140811eb4b6cf788c41ff471fd95b4.tar.bz2
glibc-d962a5d68a140811eb4b6cf788c41ff471fd95b4.zip
y2038: linux: Provide __utimes64 implementation
This patch provides new __utimes64 explicit 64 bit function for setting file's 64 bit attributes for access and modification time. Internally, the __utimensat64_helper function is used. This patch is necessary for having architectures with __WORDSIZE == 32 Y2038 safe. Moreover, a 32 bit version - __utimes has been refactored to internally use __utimes64. The __utimes is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversion of struct timeval to 64 bit struct __timeval64. Build tests: ./src/scripts/build-many-glibcs.py glibcs Run-time tests: - Run specific tests on ARM/x86 32bit systems (qemu): https://github.com/lmajewski/meta-y2038 and run tests: https://github.com/lmajewski/y2038-tests/commits/master Above tests were performed with Y2038 redirection applied as well as without to test proper usage of both __utimes64 and __utimes. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/utimes.c37
1 files changed, 26 insertions, 11 deletions
diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c
index 121d883469..75927b6ec6 100644
--- a/sysdeps/unix/sysv/linux/utimes.c
+++ b/sysdeps/unix/sysv/linux/utimes.c
@@ -16,22 +16,37 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
-#include <utime.h>
-#include <sys/time.h>
-#include <sysdep.h>
+#include <time.h>
+int
+__utimes64 (const char *file, const struct __timeval64 tvp[2])
+{
+ struct __timespec64 ts64[2];
+
+ if (tvp != NULL)
+ {
+ ts64[0] = timeval64_to_timespec64 (tvp[0]);
+ ts64[1] = timeval64_to_timespec64 (tvp[1]);
+ }
+
+ return __utimensat64_helper (0, file, tvp ? ts64 : NULL, 0);
+}
-/* Consider moving to syscalls.list. */
+#if __TIMESIZE != 64
+libc_hidden_def (__utimes64)
-/* Change the access time of FILE to TVP[0] and
- the modification time of FILE to TVP[1]. */
int
__utimes (const char *file, const struct timeval tvp[2])
{
- /* Avoid implicit array coercion in syscall macros. */
- return INLINE_SYSCALL (utimes, 2, file, &tvp[0]);
-}
+ struct __timeval64 tv64[2];
+ if (tvp != NULL)
+ {
+ tv64[0] = valid_timeval_to_timeval64 (tvp[0]);
+ tv64[1] = valid_timeval_to_timeval64 (tvp[1]);
+ }
+
+ return __utimes64 (file, tvp ? tv64 : NULL);
+}
+#endif
weak_alias (__utimes, utimes)