From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH v2 09/14] linux: Fix time64 support for futimesat
Date: Tue, 8 Sep 2020 11:57:33 -0300 [thread overview]
Message-ID: <20200908145738.640039-9-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20200908145738.640039-1-adhemerval.zanella@linaro.org>
The generic implementation does not support time64 and the default
one return overflow for invalid tv_sec with UTIME_NOW / UTIME_OMIT
(which is valid since tv_sec in such cases is ignored by the
kernel).
Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).
---
sysdeps/unix/sysv/linux/generic/futimesat.c | 52 ---------------------
sysdeps/unix/sysv/linux/utimensat.c | 8 +++-
2 files changed, 6 insertions(+), 54 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/generic/futimesat.c
diff --git a/sysdeps/unix/sysv/linux/generic/futimesat.c b/sysdeps/unix/sysv/linux/generic/futimesat.c
deleted file mode 100644
index 7be1fbc252..0000000000
--- a/sysdeps/unix/sysv/linux/generic/futimesat.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* futimesat -- Change access and modification times of file. Linux version.
- Copyright (C) 2005-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
-
- 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 <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <utime.h>
-#include <sys/time.h>
-#include <sysdep.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])
-{
- struct timespec tsp[2];
- int result;
-
- if (tvp)
- {
- if (tvp[0].tv_usec >= 1000000 || tvp[0].tv_usec < 0
- || tvp[1].tv_usec >= 1000000 || tvp[1].tv_usec < 0)
- {
- __set_errno (EINVAL);
- return -1;
- }
- TIMEVAL_TO_TIMESPEC (&tvp[0], &tsp[0]);
- TIMEVAL_TO_TIMESPEC (&tvp[1], &tsp[1]);
- }
-
- result = INLINE_SYSCALL (utimensat, 4, fd, file, tvp ? tsp : NULL, 0);
- return result;
-}
diff --git a/sysdeps/unix/sysv/linux/utimensat.c b/sysdeps/unix/sysv/linux/utimensat.c
index ea23c2f051..72784d824a 100644
--- a/sysdeps/unix/sysv/linux/utimensat.c
+++ b/sysdeps/unix/sysv/linux/utimensat.c
@@ -36,9 +36,13 @@ __utimensat64_helper (int fd, const char *file,
if (ret == 0 || errno != ENOSYS)
return ret;
+ /* For UTIME_NOW and UTIME_OMIT the value of tv_sec field is ignored. */
+# define NS_VALID(ns) \
+ ((((ns).tv_nsec == UTIME_NOW || (ns).tv_nsec == UTIME_OMIT) \
+ || in_time_t_range ((ns).tv_sec)))
+
if (tsp64 != NULL
- && (! in_time_t_range (tsp64[0].tv_sec)
- || ! in_time_t_range (tsp64[1].tv_sec)))
+ && (!NS_VALID (tsp64[0]) || !NS_VALID (tsp64[1])))
{
__set_errno (EOVERFLOW);
return -1;
--
2.25.1
next prev parent reply other threads:[~2020-09-08 14:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 14:57 [PATCH v2 01/14] linux: Simplify clock_getres Adhemerval Zanella
2020-09-08 14:57 ` [PATCH v2 02/14] linux: Add ppoll time64 optimization Adhemerval Zanella
2020-09-10 19:21 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 03/14] linux: Add time64 semtimedop support Adhemerval Zanella
2020-09-10 19:23 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 04/14] linux: Add time64 pselect support Adhemerval Zanella
2020-09-10 19:35 ` Alistair Francis
2020-09-12 1:22 ` H.J. Lu
2020-09-08 14:57 ` [PATCH v2 05/14] linux: Add time64 select support Adhemerval Zanella
2020-09-11 20:44 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 06/14] linux: Add time64 sigtimedwait support Adhemerval Zanella
2020-09-11 20:56 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 07/14] linux: Use 64-bit time_t syscall on clock_getcputclockid Adhemerval Zanella
2020-09-16 15:26 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 08/14] linux: Consolidate utimes Adhemerval Zanella
2020-09-16 15:30 ` Alistair Francis
2020-09-08 14:57 ` Adhemerval Zanella [this message]
2020-09-08 14:57 ` [PATCH v2 10/14] linux: Add time64 support for nanosleep Adhemerval Zanella
2020-09-16 17:16 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 11/14] linux: Add time64 recvmmsg support Adhemerval Zanella
2020-09-25 21:18 ` Alistair Francis
2020-09-08 14:57 ` [RFC 12/14] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Adhemerval Zanella
2020-09-08 14:57 ` [RFC 13/14] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella
2020-09-08 14:57 ` [RFC 14/14] linux: Add recvvmsg " Adhemerval Zanella
2020-09-10 19:20 ` [PATCH v2 01/14] linux: Simplify clock_getres Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200908145738.640039-9-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).