From patchwork Tue Sep 1 20:37:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40349 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 BD944395C855; Tue, 1 Sep 2020 20:37:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD944395C855 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1598992644; bh=+y23UeBD2k4MkN+vfDAK8JjQ27wAgOcf4OKjhzZNJAg=; 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=hUlK0cloO7hVKLkCRaHPVv+03Hy/Hd/39zseoaXUXS0+so/IfTf5HOj1/Lgte7Kss LnTVjORBLlCaoS/KsSphhC8fkNkmZ/IjDrJ+EEzYX2eSRE3xvOU7QlZoLPWjqAN7Ty vetEx20DTreNBBvIWXxRtGShSccOjFS3x7Y3SNTM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id 162F63959E47 for ; Tue, 1 Sep 2020 20:37:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 162F63959E47 Received: by mail-qt1-x844.google.com with SMTP id n18so2010270qtw.0 for ; Tue, 01 Sep 2020 13:37:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+y23UeBD2k4MkN+vfDAK8JjQ27wAgOcf4OKjhzZNJAg=; b=QH/PZDGGg7sxBoc+0fiLgNSfWGkcFUpuTIKyjAaGpuGLYaXTMH+YXd5AeZ0M2HyxBw xa0GCJPBCPmjb9/CAcfdUdYhxsaeqpEmpP42YpjbrmDkZ0qrm3hZTl0GH2hpcRse0hpF R0E1BWb+igPALuR9ALlnukkkdpSRhuvjV4Npu1WFhoA57DOF8tJvy9ap8Zfq23kAeVhO cNvL5Al5tOyrg9AMW3bHt0PaBeJ2IS6u55aHD0OiLtpaOA+Vd2p39cICO/84XPgqrkZC lrMfHFVMLKmZG8aRdAHVEYQKr45eec0ZZaAk5Xcw12BQBKCbq1kpw4vV0Z5PLksCo61U 5ryw== X-Gm-Message-State: AOAM530u9mkXOHq4CnCThtgnWQ2Znf/SuEwUko5bps9DQxLJK3jsWzR+ ZhqH9t8welvFEQPX6kTxhxlMPRwPJAeYwg== X-Google-Smtp-Source: ABdhPJx2uJ9DmTLHFSfnxCTXTT7KW/tPDs6VtVwgYk779PrXutCe7edkq9w++g6jajutgtFlonWPhw== X-Received: by 2002:ac8:140b:: with SMTP id k11mr3680812qtj.287.1598992642386; Tue, 01 Sep 2020 13:37:22 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z29sm2940176qtj.79.2020.09.01.13.37.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 13:37:11 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 3/5] Use LFS readdir in generic POSIX getcwd [BZ# 22899] Date: Tue, 1 Sep 2020 17:37:02 -0300 Message-Id: <20200901203704.172996-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200901203704.172996-1-adhemerval.zanella@linaro.org> References: <20200901203704.172996-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.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 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@sourceware.org Sender: "Libc-alpha" Checked on x86_64-linux-gnu and i686-linux-gnu. --- sysdeps/posix/getcwd.c | 9 +++++---- sysdeps/unix/sysv/linux/readdir64.c | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c index 3693e69c1d..3958bcecba 100644 --- a/sysdeps/posix/getcwd.c +++ b/sysdeps/posix/getcwd.c @@ -96,11 +96,12 @@ # define __lstat64 lstat # define __closedir closedir # define __opendir opendir -# define __readdir readdir +# define __readdir64 readdir # define __fdopendir fdopendir # define __openat openat # define __rewinddir rewinddir # define __openat64 openat +# define dirent64 dirent #else # include #endif @@ -259,7 +260,7 @@ __getcwd_generic (char *buf, size_t size) while (!(thisdev == rootdev && thisino == rootino)) { - struct dirent *d; + struct dirent64 *d; dev_t dotdev; ino_t dotino; bool mount_point; @@ -312,7 +313,7 @@ __getcwd_generic (char *buf, size_t size) /* Clear errno to distinguish EOF from error if readdir returns NULL. */ __set_errno (0); - d = __readdir (dirstream); + d = __readdir64 (dirstream); /* When we've iterated through all directory entries without finding one with a matching d_ino, rewind the stream and consider each @@ -325,7 +326,7 @@ __getcwd_generic (char *buf, size_t size) { use_d_ino = false; __rewinddir (dirstream); - d = __readdir (dirstream); + d = __readdir64 (dirstream); } if (d == NULL) diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c index 7d4b0001b3..170a889c51 100644 --- a/sysdeps/unix/sysv/linux/readdir64.c +++ b/sysdeps/unix/sysv/linux/readdir64.c @@ -42,7 +42,11 @@ weak_alias (__readdir64, readdir) /* The compat code expects the 'struct direct' with d_ino being a __ino_t instead of __ino64_t. */ # include +# if IS_IN(rtld) +weak_alias (__readdir64, readdir64) +# else versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2); +# endif # if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) # include # define __READDIR attribute_compat_text_section __old_readdir64