aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorLukasz Majewski <lukma@denx.de>2020-02-06 13:25:35 +0100
committerLukasz Majewski <lukma@denx.de>2020-03-03 14:28:08 +0100
commit66449d93393dabbfcf33c045c1d3cb49e77a25e4 (patch)
tree390e7c1e6f473808bb6ec9ef490be0883d5576da /sysdeps
parentd962a5d68a140811eb4b6cf788c41ff471fd95b4 (diff)
downloadglibc-66449d93393dabbfcf33c045c1d3cb49e77a25e4.tar
glibc-66449d93393dabbfcf33c045c1d3cb49e77a25e4.tar.gz
glibc-66449d93393dabbfcf33c045c1d3cb49e77a25e4.tar.bz2
glibc-66449d93393dabbfcf33c045c1d3cb49e77a25e4.zip
y2038: linux: Provide __utime64 implementation
This patch replaces auto generated wrapper (as described in sysdeps/unix/sysv/linux/syscalls.list) for utime with one which adds extra support for setting file's access and modification 64 bit time on machines with __TIMESIZE != 64. Internally, the __utimensat_time64 helper function is used. This patch is necessary for having architectures with __WORDSIZE == 32 && __TIMESIZE != 64 Y2038 safe. Moreover, a 32 bit version - __utime has been refactored to internally use __utime64. The __utime is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversion between struct utimbuf and struct __utimbuf64. 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 __utime64 and __utime. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list1
-rw-r--r--sysdeps/unix/sysv/linux/utime.c56
2 files changed, 56 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 5d65ed23e0..e40f993495 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -65,7 +65,6 @@ swapon - swapon i:si __swapon swapon
swapoff - swapoff i:s __swapoff swapoff
unshare EXTRA unshare i:i unshare
uselib EXTRA uselib i:s __compat_uselib uselib@GLIBC_2.0:GLIBC_2.23
-utime - utime i:sP utime
chown - chown i:sii __libc_chown __chown chown
diff --git a/sysdeps/unix/sysv/linux/utime.c b/sysdeps/unix/sysv/linux/utime.c
new file mode 100644
index 0000000000..2cd9334a6f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/utime.c
@@ -0,0 +1,56 @@
+/* utime -- Change access and modification times of file. Linux version.
+ Copyright (C) 2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <utime.h>
+#include <time.h>
+
+int
+__utime64 (const char *file, const struct __utimbuf64 *times)
+{
+ struct __timespec64 ts64[2];
+
+ if (times != NULL)
+ {
+ ts64[0].tv_sec = times->actime;
+ ts64[0].tv_nsec = 0LL;
+ ts64[1].tv_sec = times->modtime;
+ ts64[1].tv_nsec = 0LL;
+ }
+
+ return __utimensat64_helper (0, file, times ? ts64 : NULL, 0);
+}
+
+#if __TIMESIZE != 64
+libc_hidden_def (__utime64)
+
+int
+__utime (const char *file, const struct utimbuf *times)
+{
+ struct __utimbuf64 utb64;
+
+ if (times != NULL)
+ {
+ utb64.actime = (__time64_t) times->actime;
+ utb64.modtime = (__time64_t) times->modtime;
+ }
+
+ return __utime64 (file, times ? &utb64 : NULL);
+}
+#endif
+strong_alias (__utime, utime)
+libc_hidden_def (utime)