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);