From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: Lukasz Majewski <lukma@denx.de>,
Joseph Myers <joseph@codesourcery.com>,
Paul Eggert <eggert@cs.ucla.edu>
Cc: Alistair Francis <alistair23@gmail.com>,
Alistair Francis <alistair.francis@wdc.com>,
GNU C Library <libc-alpha@sourceware.org>,
Siddhesh Poyarekar <siddhesh@gotplt.org>,
Florian Weimer <fweimer@redhat.com>,
Florian Weimer <fw@deneb.enyo.de>,
Zack Weinberg <zackw@panix.com>,
Carlos O'Donell <carlos@redhat.com>,
Andreas Schwab <schwab@suse.de>
Subject: Re: [PATCH 2/3] y2038: linux: Provide __utimes64 implementation
Date: Thu, 20 Feb 2020 11:53:32 -0300 [thread overview]
Message-ID: <514c7fda-8607-8aa3-feeb-7a79c4329a11@linaro.org> (raw)
In-Reply-To: <20200207130009.19396-3-lukma@denx.de>
On 07/02/2020 10:00, Lukasz Majewski wrote:
> 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.
LGTM with some smalls changes below.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> include/time.h | 3 +++
> sysdeps/unix/sysv/linux/utimes.c | 37 ++++++++++++++++++++++----------
> 2 files changed, 29 insertions(+), 11 deletions(-)
>
> diff --git a/include/time.h b/include/time.h
> index e38f5e32e6..b04747889a 100644
> --- a/include/time.h
> +++ b/include/time.h
> @@ -211,8 +211,11 @@ libc_hidden_proto (__clock_getres64);
> #endif
>
> #if __TIMESIZE == 64
> +# define __utimes64 __utimes
> # define __utimensat64 __utimensat
> #else
> +extern int __utimes64 (const char *file, const struct __timeval64 tvp[2]);
> +libc_hidden_proto (__utimes64)
> extern int __utimensat64 (int fd, const char *file,
> const struct __timespec64 tsp[2], int flags);
> libc_hidden_proto (__utimensat64);
Ok.
> diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c
> index 121d883469..09c4e56f18 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)
No implicit checks.
> + {
> + ts64[0] = timeval64_to_timespec64 (tvp[0]);
> + ts64[1] = timeval64_to_timespec64 (tvp[1]);
> + }
> +
> + return __utimensat64_helper (0, file, tvp ? ts64 : NULL, 0);
> +}
Ok.
>
> -/* 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)
No implicit checks.
> + {
> + 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)
>
Ok.
next prev parent reply other threads:[~2020-02-20 14:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 13:00 [PATCH 0/3] y2038: Refactor utime and utimes to support 64 bit time Lukasz Majewski
2020-02-07 13:00 ` [PATCH 1/3] y2038: Introduce struct __utimbuf64 - new internal glibc type Lukasz Majewski
2020-02-07 20:52 ` Alistair Francis
2020-02-20 14:53 ` Adhemerval Zanella
2020-02-07 13:00 ` [PATCH 2/3] y2038: linux: Provide __utimes64 implementation Lukasz Majewski
2020-02-20 14:53 ` Adhemerval Zanella [this message]
2020-02-20 15:23 ` Lukasz Majewski
2020-02-20 17:00 ` Adhemerval Zanella
2020-02-20 22:25 ` Lukasz Majewski
2020-02-07 13:00 ` [PATCH 3/3] y2038: linux: Provide __utime64 implementation Lukasz Majewski
2020-02-20 14:53 ` Adhemerval Zanella
2020-02-20 15:36 ` Lukasz Majewski
2020-02-14 8:56 ` [PATCH 0/3] y2038: Refactor utime and utimes to support 64 bit time Lukasz Majewski
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=514c7fda-8607-8aa3-feeb-7a79c4329a11@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=carlos@redhat.com \
--cc=eggert@cs.ucla.edu \
--cc=fw@deneb.enyo.de \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=lukma@denx.de \
--cc=schwab@suse.de \
--cc=siddhesh@gotplt.org \
--cc=zackw@panix.com \
/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).