From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 9D2583857C71 for ; Thu, 23 Feb 2023 16:30:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9D2583857C71 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1720600a5f0so16186245fac.11 for ; Thu, 23 Feb 2023 08:30:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677169804; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=sDQ17mXEC62LSioGOGtt/thGVqExGKvHvqoeKGt03RI=; b=ux6AuAfBWH2v6BIsR/8EqaISyn3NqOmQ2BCQaIPhbFU7Ca9F0jvbxXKCjaLDUWW9SY LfE2OJt9B/huXyYR0h/S+34cMQwnWc3JkRGE9nM2MqI/cCYdr4XE7+YBHp+69KVvq1tq OPJy3suf7qAQstZvhURHSXrw0pd1u3Rwpc1oZiRMMC8oG4p+ueUhUSuYqWh5LJcNC9po i2ggoEwZc+hcaBKwlsJFMEumLzVRoqg18F/x1z/eRDnFMTF4GvOwzhbvDcJiDkS2spSs wdGRhfZO0AXjH3yuRfAcf26YSDR+gQ7dtaVqFL+ZDy1wenGjnZvi+tuZHFNG+g7MRh+z cghQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677169804; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sDQ17mXEC62LSioGOGtt/thGVqExGKvHvqoeKGt03RI=; b=r+2x4C29QIhKO7nT29vsGJNodq97wqkGFOGBkuirlgH4N0BsYh/L+uHh6Kp6ij8tUE 9oKgjH6jHHTjSZM49iA9CxdnjmZGgN/bQVV1ojAQQOSNr5WDcPSlBf2wQ7y9Ktb95rkE WKx2YLUJVzI6tEki4TPpK4TADpVUbWdXi+EG0NDf6RQUzqCZTxxcGwVVE4xg3ZRsf8JS rh2q2EJR8KQFcYXobI0/9D/E+YyuV5Kc+q5pfDdcZEmRdeUvmPjKVUDV8c1/xwj48EVH Vwpf1hTB89EJXuDiIJVXQ6Gy3iUy3n64fGxVZg0jb0Vo/QJIQBJ09Vyif/PCpCiY96X+ UGlA== X-Gm-Message-State: AO0yUKU341GmaSf9bQ7PbjCgz7HfW/Rio2YEbR7797uzGfRTP9H9bKvf SioseBCuLH0jTIYrgqikDXAmS8MHhsxrBrKTotg= X-Google-Smtp-Source: AK7set/SX8z/zrkBe+lPQOnwA4M6S+h1Q5+nMIHYmR5zH3Bkbz8rHMmvY1Koe2+TZLqUJuIbGqL+qQ== X-Received: by 2002:a05:6870:ea97:b0:16d:ccf9:bb4d with SMTP id s23-20020a056870ea9700b0016dccf9bb4dmr9825796oap.39.1677169804168; Thu, 23 Feb 2023 08:30:04 -0800 (PST) Received: from ?IPV6:2804:1b3:a7c3:89be:8c1b:4e8b:6072:80c5? ([2804:1b3:a7c3:89be:8c1b:4e8b:6072:80c5]) by smtp.gmail.com with ESMTPSA id k7-20020a056870d38700b00172899830dasm424922oag.4.2023.02.23.08.30.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Feb 2023 08:30:03 -0800 (PST) Message-ID: Date: Thu, 23 Feb 2023 13:30:01 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: Re: [PATCH] support: use 64-bit time_t (bug 30111) Content-Language: en-US To: libc-alpha@sourceware.org, Andreas Schwab References: From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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);