From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Andreas Schwab <schwab@suse.de>
Subject: Re: [PATCH] support: use 64-bit time_t (bug 30111)
Date: Thu, 23 Feb 2023 13:30:01 -0300 [thread overview]
Message-ID: <d07f3c70-c970-4dbc-b4de-886fb834249d@linaro.org> (raw)
In-Reply-To: <mvmilfsnzp9.fsf@suse.de>
On 23/02/23 12:55, Andreas Schwab via Libc-alpha wrote:
> Ensure to use 64-bit time_t in the test infrastructure.
> ---
> support/Makefile | 10 ++++++++++
> support/support_can_chroot.c | 4 ++--
> support/support_copy_file.c | 2 +-
> support/support_descriptor_supports_holes.c | 2 +-
> 4 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/support/Makefile b/support/Makefile
> index b29b7eb505..1df57d10fc 100644
> --- a/support/Makefile
> +++ b/support/Makefile
> @@ -238,6 +238,16 @@ CFLAGS-support_paths.c = \
> CFLAGS-timespec.c += -fexcess-precision=standard
> CFLAGS-timespec-time64.c += -fexcess-precision=standard
>
> +# Ensure that general support files use 64-bit time_t
> +CFLAGS-support_can_chroot.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
> +CFLAGS-support_copy_file.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
> +CFLAGS-support_copy_file_range.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
> +CFLAGS-support_descriptor_supports_holes.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
> +CFLAGS-support_descriptors.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
> +CFLAGS-support_stat_nanoseconds.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
> +CFLAGS-support_test_main.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
> +CFLAGS-test-container.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
The shell-container.c should also use 64 bit time_t, although it already
defines _FILE_OFFSET_BITS=64. I recommend to remove from .c file and
move it to Makefile.
The xmkdirp.c also uses stat; and the delayed_exit.c, support_subprocess.c,
and support_process_state.c also uses nanosleep. I would recommend to cover
these as well.
The rest looks ok.
> +
> ifeq (,$(CXX))
> LINKS_DSO_PROGRAM = links-dso-program-c
> else
> diff --git a/support/support_can_chroot.c b/support/support_can_chroot.c
> index 7d9f91205d..7b4f491b53 100644
> --- a/support/support_can_chroot.c
> +++ b/support/support_can_chroot.c
> @@ -29,14 +29,14 @@ static void
> callback (void *closure)
> {
> int *result = closure;
> - struct stat64 before;
> + struct stat before;
> xstat ("/dev", &before);
> if (chroot ("/dev") != 0)
> {
> *result = errno;
> return;
> }
> - struct stat64 after;
> + struct stat after;
> xstat ("/", &after);
> TEST_VERIFY (before.st_dev == after.st_dev);
> TEST_VERIFY (before.st_ino == after.st_ino);
> diff --git a/support/support_copy_file.c b/support/support_copy_file.c
> index 50ff87b9f1..f3e0a2d1b7 100644
> --- a/support/support_copy_file.c
> +++ b/support/support_copy_file.c
> @@ -24,7 +24,7 @@
> void
> support_copy_file (const char *from, const char *to)
> {
> - struct stat64 st;
> + struct stat st;
> xstat (from, &st);
> int fd_from = xopen (from, O_RDONLY, 0);
> mode_t mode = st.st_mode & 0777;
> diff --git a/support/support_descriptor_supports_holes.c b/support/support_descriptor_supports_holes.c
> index 7af5934808..91db216bf0 100644
> --- a/support/support_descriptor_supports_holes.c
> +++ b/support/support_descriptor_supports_holes.c
> @@ -40,7 +40,7 @@ support_descriptor_supports_holes (int fd)
> block_headroom = 32,
> };
>
> - struct stat64 st;
> + struct stat st;
> xfstat (fd, &st);
> if (!S_ISREG (st.st_mode))
> FAIL_EXIT1 ("descriptor %d does not refer to a regular file", fd);
prev parent reply other threads:[~2023-02-23 16:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-23 15:55 Andreas Schwab
2023-02-23 16:17 ` Adhemerval Zanella Netto
2023-02-23 16:30 ` Adhemerval Zanella Netto [this message]
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=d07f3c70-c970-4dbc-b4de-886fb834249d@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
--cc=schwab@suse.de \
/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).