From patchwork Tue May 31 16:24:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54567 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF1EA395B438 for ; Tue, 31 May 2022 16:25:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF1EA395B438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014354; bh=nfbEnRg/mAO8pnFsgD8QgdWW8hghaOpuw9J1HBvw9rE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=NI2uX6iGI754JvLhpXQSlS5U5DM6ZFVGpDhrvl3FIHdhxeSiKzb3GyJOEbS+xEVKH 6IUX8vqsBrlMHcM3t+sHI3e289ImCbPMl+of9dU33YI8JUj7r51Dv0HaBm8s52dGOs oIvYix0sKJBAc2q1yeQCmTq7IkQxf3kWIMwNYMQA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 39408395B407 for ; Tue, 31 May 2022 16:24:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 39408395B407 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-e93bbb54f9so18970476fac.12 for ; Tue, 31 May 2022 09:24:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nfbEnRg/mAO8pnFsgD8QgdWW8hghaOpuw9J1HBvw9rE=; b=LUG5YsekYdyHoUTMLH5oha75NtouNj1IWMWF/HfmEYVKrH4Z5UJvKt924dRAa0obfj auD8gewKswErVw/uaZxgHdz2abduMEcDvAqkiuk+9ZmjDFw2WY9tpqc//niFrIEr0MCA 2JIDdKAsioPaiB0MB6bUSdiZoF5z33hi71y2EtqUGo+kr8JGUXnV5Cffjixmphu2ugnX tnxLS0ZTFfJOPfbJB1Y6ltdnSaszfZTI52lNz9cLe8qpuJg1r2ll4NHMR2JdavLy1CbC B6EExQHrW39cBXxHzVuvx/+sy+XX6DaLJj+cp1EiSU0JbgrDZgUm0BG4yW1VpyhOhU6m wJRQ== X-Gm-Message-State: AOAM532Xp2eFfvrznBKooiOUuK4LI3nW+Y99/w88FTk7UrhhFr/2izn/ repFS8nGaTiUdRh1A+0pMYEdge0m5lss3w== X-Google-Smtp-Source: ABdhPJwTcFK1qxrF5zqyC7O/qX5RdSIfUKj+zEaJciqFdVs4x6VdPuUa2KgjtLCRmvFgGrE+HgZLiQ== X-Received: by 2002:a05:6870:1791:b0:f2:38db:8f08 with SMTP id r17-20020a056870179100b000f238db8f08mr14241824oae.260.1654014291733; Tue, 31 May 2022 09:24:51 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:51 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 1/8] misc: Use 64 bit stat for daemon (BZ# 29203) Date: Tue, 31 May 2022 13:24:36 -0300 Message-Id: <20220531162443.2231918-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is a a missing spot initially done by 52a5fe70a2c77935. Trying to come up with a testcase it tricky because to create a /dev/null device it requires root access and even test-container there is no easy way to do it. Checked on i686-linux-gnu. --- misc/daemon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/misc/daemon.c b/misc/daemon.c index 0e688f4d74..3c73ac2ab8 100644 --- a/misc/daemon.c +++ b/misc/daemon.c @@ -61,11 +61,10 @@ daemon (int nochdir, int noclose) (void)__chdir("/"); if (!noclose) { - struct stat64 st; + struct __stat64_t64 st; if ((fd = __open_nocancel(_PATH_DEVNULL, O_RDWR, 0)) != -1 - && (__builtin_expect (__fstat64 (fd, &st), 0) - == 0)) { + && __glibc_likely (__fstat64_time64 (fd, &st) == 0)) { if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0 #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR && (st.st_rdev From patchwork Tue May 31 16:24:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54568 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 64FA3395B41B for ; Tue, 31 May 2022 16:26:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 64FA3395B41B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014396; bh=53jOhcqrs4KfYMjvaUbPQpst2BeZfUBAlFTN6VwAQUs=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=XyBN9+3B+VfUtPxt92q6GGvVSYMVc7ZcK22KGqBpInaS8ktesMFL8CCX0qEWnA8Ha W2qMKVnVA+0sxvF1yLiNjF2AHy2+rPy43VOErgLlbv8AcKcUl2IAZiO2SOk5blCMGG UPolQXIB5De9usSh4yhjXrdfce5yYHDZqpwz1pkU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id D5021395B408 for ; Tue, 31 May 2022 16:24:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D5021395B408 Received: by mail-ot1-x335.google.com with SMTP id r14-20020a056830418e00b0060b8da9ff75so3776262otu.11 for ; Tue, 31 May 2022 09:24:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=53jOhcqrs4KfYMjvaUbPQpst2BeZfUBAlFTN6VwAQUs=; b=vUQ0Jrwk06vJfHAytCbdH+rDoVid1V/uuHwIzjti5dbcpJno5ahF2EOzkEKuF2+lx8 fXsSHV4fMz04MuSLzdUjO+DC8knhAbwk5OGFK4o2ybeeVIgEx310xJszOwCO5rUOcmNo uihoHRI04vWg6x2Os4jzvRKdjsZ+L8Qcw0zrPJq0IsCC2/s7l6so65EpKUrlcKj9Fz+I e3QqszD+4vgkpWn0sgz4H839HSvY0QeICUajgWkI1BfidNXI+L2HoPMZTATwNfixcSbI ygpIGg2TmIdJXFWSMh1PdzEgWqzLFgSvIaE2SQvwqwrZqAwgoZL3EMP1ZukwCp8vptk+ UPVw== X-Gm-Message-State: AOAM532ihZnFaNENab66kxApWi+4uoLzECRJ7GbzEAHuwEjaacobV2sO 9QbPUKILYf8HnqCm7KIjM9YIgNQBB2/47w== X-Google-Smtp-Source: ABdhPJwONI0ynWkZhcLBvnduQZ5YEQvEzp+08Q2HIBBQ28MAwcUczILxVSO7GuF1fmtKJsGkt0qPsg== X-Received: by 2002:a9d:674e:0:b0:60b:1953:903d with SMTP id w14-20020a9d674e000000b0060b1953903dmr15990992otm.15.1654014292934; Tue, 31 May 2022 09:24:52 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:52 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 2/8] misc: Use 64 bit stat for getusershell (BZ# 29203) Date: Tue, 31 May 2022 13:24:37 -0300 Message-Id: <20220531162443.2231918-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- misc/getusershell.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/getusershell.c b/misc/getusershell.c index 11f5aa83f8..4221095dca 100644 --- a/misc/getusershell.c +++ b/misc/getusershell.c @@ -97,7 +97,7 @@ initshells (void) { char **sp, *cp; FILE *fp; - struct stat64 statb; + struct __stat64_t64 statb; size_t flen; free(shells); @@ -106,7 +106,7 @@ initshells (void) strings = NULL; if ((fp = fopen(_PATH_SHELLS, "rce")) == NULL) goto init_okshells_noclose; - if (__fstat64(fileno(fp), &statb) == -1) { + if (__fstat64_time64(fileno(fp), &statb) == -1) { init_okshells: (void)fclose(fp); init_okshells_noclose: From patchwork Tue May 31 16:24:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54569 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 19636395B441 for ; Tue, 31 May 2022 16:27:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19636395B441 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014440; bh=HGwecEeapuyhfFQ7VqvawkInPcdT36bsU2wA8Jja/8Y=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=OY2Lku5wunWxaMnxhkmwGgPhLNq+glKYQ+9dxvoeCqsp1bLVOLwv8eJo4EI10hqWt 2EC7sSaKEdl92kY/LoQxnikFhQpa31sKhgHssg+LoXpyFCyCms54JInRAa/ae5qiQZ gjC7t7SvZe7CLm2WEoxhhNP1pO1sQFIHZSxGJYu8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id E8C19395B41B for ; Tue, 31 May 2022 16:24:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E8C19395B41B Received: by mail-ot1-x32b.google.com with SMTP id r3-20020a9d5cc3000000b0060ae1789875so9874397oti.13 for ; Tue, 31 May 2022 09:24:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HGwecEeapuyhfFQ7VqvawkInPcdT36bsU2wA8Jja/8Y=; b=BRzP8Zr6qg/h49xyLLXfk25HD81RV10EricKz2tN+5zC3CZ+fKaH54wXJ1IDb8cni1 RFoLRxNnlWbqgWFw1LBsZIyMJl6ybdTQNkNFVnrSQ4jQrVUC5SzXw6cgue9hJwXgwKce KhVO4+vFKnW2qhnf1P6EKUx87ZtufRXpLaRsq6Bwwi719kX5T5ux92QoGfOps4BVXPa9 3jCSQ/yJhMrJ+RnwBvZgm7VnpBoR9DXssGUQ4N6DzREp/funFfbrPOOLaFwUgLeyKjyq Hob2CpsVgIVl6BsIp/cNPtTCI2+4J7pucOFs7HrXJG6uTT0ZDe/Ej9Jd3SXrDp7o51PJ vBQw== X-Gm-Message-State: AOAM530N4K8ErJfhNbyp0sVhybJgFv8PC6e0FeQKPQStMcTcon1SS1/N h3HtAPz1DrEA/CNkpKXZOpz8VnsS/wtZkQ== X-Google-Smtp-Source: ABdhPJwW0SaE2YTLiwXhFBiXG6muCmiEQvWV9YUR2Kzo0Gjw5QNezxqF3taPYUY1wBgCl3adEup3bw== X-Received: by 2002:a05:6830:3152:b0:60b:830e:2683 with SMTP id c18-20020a056830315200b0060b830e2683mr4350810ots.263.1654014294114; Tue, 31 May 2022 09:24:54 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:53 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 3/8] posix: Use 64 bit stat for posix_fallocate fallback (BZ# 29207) Date: Tue, 31 May 2022 13:24:38 -0300 Message-Id: <20220531162443.2231918-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- sysdeps/posix/posix_fallocate.c | 4 ++-- sysdeps/posix/posix_fallocate64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/posix/posix_fallocate.c b/sysdeps/posix/posix_fallocate.c index 037d328647..9720e71cc6 100644 --- a/sysdeps/posix/posix_fallocate.c +++ b/sysdeps/posix/posix_fallocate.c @@ -30,7 +30,7 @@ int posix_fallocate (int fd, __off_t offset, __off_t len) { - struct stat64 st; + struct __stat64_t64 st; if (offset < 0 || len < 0) return EINVAL; @@ -48,7 +48,7 @@ posix_fallocate (int fd, __off_t offset, __off_t len) } /* We have to make sure that this is really a regular file. */ - if (__fstat64 (fd, &st) != 0) + if (__fstat64_time64 (fd, &st) != 0) return EBADF; if (S_ISFIFO (st.st_mode)) return ESPIPE; diff --git a/sysdeps/posix/posix_fallocate64.c b/sysdeps/posix/posix_fallocate64.c index a670ee0a39..bf984f7f91 100644 --- a/sysdeps/posix/posix_fallocate64.c +++ b/sysdeps/posix/posix_fallocate64.c @@ -30,7 +30,7 @@ int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) { - struct stat64 st; + struct __stat64_t64 st; if (offset < 0 || len < 0) return EINVAL; @@ -48,7 +48,7 @@ __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) } /* We have to make sure that this is really a regular file. */ - if (__fstat64 (fd, &st) != 0) + if (__fstat64_time64 (fd, &st) != 0) return EBADF; if (S_ISFIFO (st.st_mode)) return ESPIPE; From patchwork Tue May 31 16:24:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54570 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A1748395B818 for ; Tue, 31 May 2022 16:28:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1748395B818 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014486; bh=pqjxUzhhHfbvX/NtO2kVxG6qmEyGYynHjx4FXaTaa0c=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ECjt2kUYRQGtB8EWi+ewQqcMy56kCOdlMTt6OeQa88ZBKKf/Qu1qFO+ERgCrCAD2F flJBdBGc7wvl5tFHkO8OupLnhwl/p/ihdDTUDljeqP0SVQUn6g7Gobfh4FtaVuSl4U w4rnFFmptOsGc9tcyKK1BIpvQpoQ0fpAZm2u+gNk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id E2C51395B413 for ; Tue, 31 May 2022 16:24:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E2C51395B413 Received: by mail-ot1-x331.google.com with SMTP id h9-20020a056830400900b0060b03bfe792so9884735ots.12 for ; Tue, 31 May 2022 09:24:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pqjxUzhhHfbvX/NtO2kVxG6qmEyGYynHjx4FXaTaa0c=; b=xCskTpuILAxvTnPGlLsdUD6eZxXMCTVuAtgHV2ahiyqlgbRYvmSpxYcquJuoubrpNQ goUJmR3DXoIwPUC8MUkGSbUkZsq8TOVOpRJsJzvBqTDZXOkvAq/i4pGB2j2g2Fg+dlmk uIlhTcS1KEYy7ftllu9oXajROm30IjN/JmSx1XuaHI1+RCaO19HiLCCmM0InX07FWQYY eHIpeyB/GtU5zYitD9n9BWkSBSs9MIoVHmYPSQQH6Izy35k1vVEmYB9YVSL0zvt+rD4t Gb/ZsuPt40rhskb1reNwANwxNtsfXZlo6AxWwQdmCJUKdxDc3d3LQlkdnYY7ik9pXQIa +uDg== X-Gm-Message-State: AOAM53349fvM6AB+WQKdPCT0a/DNa3js6pkT7KAAd232DEKeg91vUMLP 9pjll/uMZb1e+tw02ux3os2+lQayNczRLg== X-Google-Smtp-Source: ABdhPJyIFAD7xtrIWp0qbLCPyTq7iSqxWNLdYY335XaD3bGRCDDFh2Utwdmln0qxzD2La6CHd2E+mA== X-Received: by 2002:a9d:5902:0:b0:60b:2505:139d with SMTP id t2-20020a9d5902000000b0060b2505139dmr13533393oth.132.1654014295290; Tue, 31 May 2022 09:24:55 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:55 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 4/8] posix: Use 64 bit stat for fpathconf (_PC_ASYNC_IO) (BZ# 29208) Date: Tue, 31 May 2022 13:24:39 -0300 Message-Id: <20220531162443.2231918-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- sysdeps/posix/fpathconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/posix/fpathconf.c b/sysdeps/posix/fpathconf.c index 216f2a9c8d..4b215e0600 100644 --- a/sysdeps/posix/fpathconf.c +++ b/sysdeps/posix/fpathconf.c @@ -131,9 +131,9 @@ __fpathconf (int fd, int name) #ifdef _POSIX_ASYNC_IO { /* AIO is only allowed on regular files and block devices. */ - struct stat64 st; + struct __stat64_t64 st; - if (__fstat64 (fd, &st) < 0 + if (__fstat64_time64 (fd, &st) < 0 || (! S_ISREG (st.st_mode) && ! S_ISBLK (st.st_mode))) return -1; else From patchwork Tue May 31 16:24:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54571 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DC47D395B414 for ; Tue, 31 May 2022 16:28:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC47D395B414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014535; bh=zo3ut1+trDT/wvrpU7hC0v/CtV33PUVHNsniYDYwOfQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=UG/mjiPdLmRQdGf/iwkkF6QAJ5Qonhb2a25klpZoPKzmay5KVSs088VSDQ1Lub5q9 Tv++FnH4IOcGV1NQcFR4PwvVN6Y2BS0+uu/cI+dd945wyPDRnqZnLtl3MJmgFUr+iS caf/6YEqONour56cw+CBHCjpp7Nh5SsdKIkDA94k= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by sourceware.org (Postfix) with ESMTPS id 53237395B40C for ; Tue, 31 May 2022 16:24:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 53237395B40C Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-f33f0f5b1dso6898584fac.8 for ; Tue, 31 May 2022 09:24:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zo3ut1+trDT/wvrpU7hC0v/CtV33PUVHNsniYDYwOfQ=; b=AibjSl6c0kM1jRfMuZyn+cr9Lkg6dkI4+45qenTRobnyIkiNvjPBYYLgeruSFFZDC+ NdFvlkDK8c+xbfA21nGkl7UTKIvQ7k3wERbzT6L8wUz02jYibftcg38bqtJc+cvkx3CY VroOBdxb9mi6bPQWqsXCKcf92nIJgwXIThMhEQ/WfNwBI3J85eI49kaugmjrMvvJAP/l n0r7PY1pzRCd71n3DvJvElpYJwW6DuIoa91YLLUtW4vlNbBYuQZ5oNjbnPLSR+v12+JA nJ85aiZgL4WzqPueyndjtCAhjfDykw6iACiQy+WQRm3Gakf7FHQ2PYQBrLolziCGvEIg fynw== X-Gm-Message-State: AOAM5336I7CZ0AjW14qGX5DsF/fY4Bbr6eGQZ1n2Q+8oX4wHtRRbChPZ 3/4LAUcjIzth1HB9tvY87OUwcBi8WbLOmQ== X-Google-Smtp-Source: ABdhPJwG2IV9KXzLXKHbKb6bk8og8787f8Y+gWLlmICxz7yXoH8PGESzBUwUnktMVRaJ1qI6zCE26A== X-Received: by 2002:a05:6870:14c1:b0:e6:5ba1:6194 with SMTP id l1-20020a05687014c100b000e65ba16194mr14210107oab.242.1654014296601; Tue, 31 May 2022 09:24:56 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:56 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 5/8] socket: Use 64 bit stat for isfdtype (BZ# 29209) Date: Tue, 31 May 2022 13:24:40 -0300 Message-Id: <20220531162443.2231918-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- sysdeps/posix/isfdtype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/posix/isfdtype.c b/sysdeps/posix/isfdtype.c index 192c7f9be6..d26c14259e 100644 --- a/sysdeps/posix/isfdtype.c +++ b/sysdeps/posix/isfdtype.c @@ -24,12 +24,12 @@ int isfdtype (int fildes, int fdtype) { - struct stat64 st; + struct __stat64_t64 st; int result; { int save_error = errno; - result = __fstat64 (fildes, &st); + result = __fstat64_time64 (fildes, &st); __set_errno (save_error); } From patchwork Tue May 31 16:24:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54572 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C8C6C395B412 for ; Tue, 31 May 2022 16:29:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C8C6C395B412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014577; bh=BYsC8d90Lo/Az4VJsJSGqf+gKIyBMK9mFrNKskG92G0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=T+F+0zS1vMEQspMCXhLpCcoIjzkBVaHzwg+RTTII0HS1r1Qxc4o0B/cgqywmv3MrD rvAdIFglwa+IfGORF9/ZxKuM4Pm/9vEtTb+uoKgG+qTnRLJUYG0gMZkbSlQ0XGO+or TQ4h6pbmd+OBJpixrwp9PLMrQunQPokEOXnqm7DY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id DD20A395B440 for ; Tue, 31 May 2022 16:24:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD20A395B440 Received: by mail-oi1-x22a.google.com with SMTP id r65so12969964oia.9 for ; Tue, 31 May 2022 09:24:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BYsC8d90Lo/Az4VJsJSGqf+gKIyBMK9mFrNKskG92G0=; b=KSEu9D/VPMYROwTzQAb605IuhPjrgz1zHrUx2BoVMlYDab8zoUb7teoyLZjwX8CBG4 JkF4hIeornzbztJw0pQpwNTRhlmqcqmPda8M3L/luNCGXQHUSM+gY6hVbHOQvm+8E8dR brtXjLmXrpPwnZlEgQile4CBk7/pdCjv3Vm6Soyw7/fm2yreXy6Md2NPI1ZJ7yMkAHIa j5lvxNlc44Ip6dmeo8q0ZLq4sK3Tg9Uwjnw6yNHc6A1l0AJqKCgxlGdaYMiFPoDqIqr7 FDADY7Jf9oO3twem/UxBizAGW6UD/ZZ48GgyRjfcHdggAwrF6QDtGq8hsjAw01YkZct5 SUEg== X-Gm-Message-State: AOAM530rBZT3EevlZEAAdFjz8yUZNL1jW5C5lhMaFYWELvhiz5ukCYwV P3W/hzvXwvJJvUMWsKVms/bJeYW0NwHU4g== X-Google-Smtp-Source: ABdhPJyBj9/Lz27dwhyOFIj/dD3J3ryu73CLfJ8pv9iKQ9Dnzc5LA/zpjE0C9sJGGvpRIhOTxCIdqQ== X-Received: by 2002:a05:6808:1206:b0:2d7:65a8:65e with SMTP id a6-20020a056808120600b002d765a8065emr12822651oil.107.1654014297835; Tue, 31 May 2022 09:24:57 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:57 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 6/8] inet: Use 64 bit stat for ruserpass (BZ# 29210) Date: Tue, 31 May 2022 13:24:41 -0300 Message-Id: <20220531162443.2231918-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- inet/ruserpass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inet/ruserpass.c b/inet/ruserpass.c index d61a72877d..75e2a06552 100644 --- a/inet/ruserpass.c +++ b/inet/ruserpass.c @@ -95,7 +95,7 @@ ruserpass (const char *host, const char **aname, const char **apass) char *hdir, *buf, *tmp; char myname[1024], *mydomain; int t, usedefault = 0; - struct stat64 stb; + struct __stat64_t64 stb; hdir = __libc_secure_getenv("HOME"); if (hdir == NULL) { @@ -174,7 +174,7 @@ next: break; case PASSWD: if (strcmp(*aname, "anonymous") && - __fstat64(fileno(cfile), &stb) >= 0 && + __fstat64_time64(fileno(cfile), &stb) >= 0 && (stb.st_mode & 077) != 0) { warnx(_("Error: .netrc file is readable by others.")); warnx(_("Remove 'password' line or make file unreadable by others.")); From patchwork Tue May 31 16:24:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54573 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8AA73395B40C for ; Tue, 31 May 2022 16:30:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8AA73395B40C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014619; bh=sjJbIfggp5sqzo7K5eItsEtTGZQmUjBs48buPgH6cP0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=uDnMtOa6sufppmskXnrLdn4h00pAiQyMdN52EPkDv4z4BipP3zZIxNDvXQi2PDWJq 6sgKInvAPLxJuQPgeLewuX/zpVXJfwtXrXTHwTrEOczvLt/cz90qOHN6MXY/6gmfVS BCCybbp15LWEItLgDR+Tdrs3VjOm9oPI+HVuDoaI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by sourceware.org (Postfix) with ESMTPS id 0763C395B408 for ; Tue, 31 May 2022 16:25:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0763C395B408 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-f2bb84f9edso18975025fac.10 for ; Tue, 31 May 2022 09:24:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sjJbIfggp5sqzo7K5eItsEtTGZQmUjBs48buPgH6cP0=; b=IEE6glzWctLnZYIRes7R9mnCkgEgYYWk3PbZYFo+1GfaxiKwFNozqhXt3zsohgFhAR qJ0mvcpIQwP8nrnHY1fC8PWbjJjZlchw2C/PTfpp3RKzb/Kv+kDDHqzqcQ9jpWKVWN+/ tuwcdo5c4/ch6pjnTSzG9mYmwr1NBKdcegZE3ZfKAPY7kh9mUBvseEyewdE51VCNnGnb BjLISjC0nwN1hD+NggZET0fTZ21rkbYegFfGGoZC1duKipBZcDy3hGfYT0g03AV3Zn0t UCEUGiZmUH8Ik/DYuTdHvClOnvR0NoFVBm/aPewBMLSRWgrAIJD9JbzgZ6z14Qa1+BQw cOog== X-Gm-Message-State: AOAM530v6J2vHnxLIR9ZTvXjIhOpXdDRVNWTVmpYhvxs762l6CDMfOck ZwLD4KkbHmmXOOtEE21Rw4o38IaTuGTdyw== X-Google-Smtp-Source: ABdhPJx1djC/dzjY5Wz0rQNJeTLzQC98WZ1FwihE2vqeR11awPkdp0tQPOv5XTSm5AYgpoxdOdKxnw== X-Received: by 2002:a05:6870:a913:b0:e8:8589:507e with SMTP id eq19-20020a056870a91300b000e88589507emr14011319oab.211.1654014299135; Tue, 31 May 2022 09:24:59 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:58 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 7/8] catgets: Use 64 bit stat for __open_catalog (BZ# 29211) Date: Tue, 31 May 2022 13:24:42 -0300 Message-Id: <20220531162443.2231918-8-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- catgets/open_catalog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index 48c2a4b983..cb1d123cdb 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -39,7 +39,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, __nl_catd catalog) { int fd = -1; - struct stat64 st; + struct __stat64_t64 st; int swapping; size_t cnt; size_t max_offset; @@ -193,7 +193,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, return -1; } - if (__builtin_expect (__fstat64 (fd, &st), 0) < 0) + if (__glibc_unlikely (__fstat64_time64 (fd, &st) < 0)) goto close_unlock_return; if (__builtin_expect (!S_ISREG (st.st_mode), 0) From patchwork Tue May 31 16:24:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 54574 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D78F1395B412 for ; Tue, 31 May 2022 16:31:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D78F1395B412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014661; bh=fP3IHpF/qKmkRl/Ydh7G/TR1omLSnZSGYsdYz0Kxvks=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=NdCqo/jrva2hCLQ0cVKueSlttJpsrNxXGBuh2l5KP0pPnR/I/+gAYazIpoTJX1STn 0PR8649MjQjCI5G9JdDKsO7D49w/2B4jI/5b6UmSlYZ/kAHCJOflhyN266FMDRUM3B j59f2XXqT2oGUy+GOgVXIXz/R//XA2dzP6bmr2hQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) by sourceware.org (Postfix) with ESMTPS id AC45E395B411 for ; Tue, 31 May 2022 16:25:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AC45E395B411 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-f16a3e0529so18998717fac.2 for ; Tue, 31 May 2022 09:25:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fP3IHpF/qKmkRl/Ydh7G/TR1omLSnZSGYsdYz0Kxvks=; b=eVdrhzDRQk20brDx9XWBvPZfNZHOcYhu5FpBrLZ2Fvf8lbcxaXCT2SMPl9onIA1UQH vDTN9zMK7W2SUG2wZeTtiRaSLLmjU7+IG8rwSkkvtHuG+JacdWjxbH1+XCvbQcLf/Yk5 dnNHsNGoWyaDz61RrlAhbOOTNhRe6qsNF+7s4NWoCNwXHgYOzEz8xv24LVElOTMN0rxy pAQ4w5l9wyt7RlCLw8AUxIzRGwp4AzhVWFo+QX8q3no+6MJ0N57LEM4QxkUvBPIpBJyg 8V0czOkkdSY+2eZcqgNeFFSA4iqdHdqvIp3xBBsfYB+wvbwGwFZAuJibhTrtHfHQv6f+ KWng== X-Gm-Message-State: AOAM531Xr+Hw3Q2Y+2Zxjt02Bk6O1mHKc16s/d1D/8OiJagfQT/77+/A I880w+vsms5YfDf5b0+lsmfp/CEMjGa9AA== X-Google-Smtp-Source: ABdhPJyjSkgSRIEYNBbbjhaBj7JDgzKAPVLuXinzgwDve8fU6/kNR68xjzYyAXs39Ir+2rIvYbzrPA== X-Received: by 2002:a05:6870:ea01:b0:f1:e631:ed6f with SMTP id g1-20020a056870ea0100b000f1e631ed6fmr14071247oap.89.1654014300298; Tue, 31 May 2022 09:25:00 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:25:00 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 8/8] iconv: Use 64 bit stat for __open_catalog (BZ# 29213) Date: Tue, 31 May 2022 13:24:43 -0300 Message-Id: <20220531162443.2231918-9-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The issue is only when used within libc.so (iconvconfig already builds with _TIME_SIZE=64). This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- iconv/gconv_parseconfdir.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h index c0de548833..debb96b322 100644 --- a/iconv/gconv_parseconfdir.h +++ b/iconv/gconv_parseconfdir.h @@ -32,8 +32,11 @@ # define readdir __readdir # define closedir __closedir # define mempcpy __mempcpy -# define lstat64 __lstat64 +# define struct_stat struct __stat64_t64 +# define lstat __lstat64_time64 # define feof_unlocked __feof_unlocked +#else +# define struct_stat struct stat #endif /* Name of the file containing the module information in the directories @@ -158,12 +161,12 @@ gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len) && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0) { char *conf; - struct stat64 st; + struct_stat st; if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0) continue; if (ent->d_type != DT_UNKNOWN - || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode))) + || (lstat (conf, &st) != -1 && S_ISREG (st.st_mode))) found |= read_conf_file (conf, dir, dir_len); free (conf);