From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 122045 invoked by alias); 25 Apr 2018 19:49:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 94286 invoked by uid 89); 25 Apr 2018 19:45:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable version=3.3.2 spammy= X-HELO: mail-qt0-f195.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=vh92UVkuelg0kxitqhu4MTSbciWyN9Iy2dsXYM2KOc0=; b=mgE39bxH6D90xEqODTh/S9yZq61khc7oVc52Kn/D7VODbFIEvYCyYJzF6F5ttQaoNk ANYyyvD+wceXaX6QZXjBPW3knNORYURC3wWUtfdzjqt/yN3ajevOidEDwbwUd4X0mwPM bfMJi6nmnibmAPe0gxp39C2Vt7XuUF/PXqEWxi1IG84gGz2tEndkv/ml0tKu6QQlP0bV GiYpGlO3GieueJgzvb7EFkbU4EMJwJXVuxG8YkTZ1gkwAsjuTs+kLhh+xZ7FEgC9BK32 F0671rNJkrIfBYwpguBn2Lp7GZTLtzkSLP6IlBJWMFIEA2Wqj/OaObrMUE9Jp6zr+RS2 4kLw== X-Gm-Message-State: ALQs6tC9mIQaw8XQyoFLtLsJdwpYQH+8bC+gPsWyD50bnOgcbm+VpxjT DcOMZ3oYh2ciDvjFAsAov0S7C3d9Sog= X-Google-Smtp-Source: AIpwx4+wF7D9HEoBi1kTdiBKEJIW75l5fUPZI5GNuhokyNkWRYbuMXfk9igYulVhjyOovCmzVrQxVg== X-Received: by 2002:ac8:4111:: with SMTP id q17-v6mr33100149qtl.122.1524685509920; Wed, 25 Apr 2018 12:45:09 -0700 (PDT) Subject: Re: [PATCH 7/7] Consolidate getdirentries{64} implementation From: Adhemerval Zanella To: libc-alpha@sourceware.org References: <1520017165-15830-1-git-send-email-adhemerval.zanella@linaro.org> <1520017165-15830-7-git-send-email-adhemerval.zanella@linaro.org> Openpgp: preference=signencrypt Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <64f4270a-e78e-af75-0b4e-0b9f6a3bf787@linaro.org> Date: Wed, 25 Apr 2018 19:49:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1520017165-15830-7-git-send-email-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-04/txt/msg00557.txt.bz2 I will commit this shortly if no one opposes it. On 02/03/2018 15:59, Adhemerval Zanella wrote: > This patch consolidates Linux getdirentries{64} implementation on just > the default sysdeps/unix/sysv/linux/getdirentries{64} ones. The default > implementation handles the Linux requirements: > > * getdirentries is only built for _DIRENT_MATCHES_DIRENT64 being 0. > > * getdirentries64 is always built and aliased to getdents for ABIs > that define _DIRENT_MATCHES_DIRENT64 to 1. > > Checked on aarch64-linux-gnu, x86_64-linux-gnu, i686-linux-gnu, > sparcv9-linux-gnu, sparc64-linux-gnu, powerpc-linux-gnu, and > powerpc64le-linux-gnu. > > * sysdeps/unix/sysv/linux/getdirentries.c (getdirentries): Build iff > _DIRENT_MATCHES_DIRENT64 is not defined. > * sysdeps/unix/sysv/linux/getdirentries64.c (getdirentries64): Open > implementation and alias to getdirentries if _DIRENT_MATCHES_DIRENT64 > is defined. > * sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c: Remove file. > * sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c: Remove file. > --- > ChangeLog | 8 +++++ > sysdeps/unix/sysv/linux/getdirentries.c | 21 +++++------ > sysdeps/unix/sysv/linux/getdirentries64.c | 41 ++++++++++++++++++++-- > .../unix/sysv/linux/wordsize-64/getdirentries.c | 3 -- > .../unix/sysv/linux/wordsize-64/getdirentries64.c | 1 - > 5 files changed, 54 insertions(+), 20 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c > delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c > > diff --git a/sysdeps/unix/sysv/linux/getdirentries.c b/sysdeps/unix/sysv/linux/getdirentries.c > index bc40292..23f626b 100644 > --- a/sysdeps/unix/sysv/linux/getdirentries.c > +++ b/sysdeps/unix/sysv/linux/getdirentries.c > @@ -16,26 +16,21 @@ > . */ > > #include > -#include > - > -#ifndef GETDIRENTRIES > -# define GETDIRENTRIES getdirentries > -# define __GETDENTS __getdents > -#else > -# define off_t off64_t > -# define __lseek __lseek64 > -#endif > + > +#if !_DIRENT_MATCHES_DIRENT64 > +# include > > ssize_t > -GETDIRENTRIES (int fd, char *buf, size_t nbytes, off_t *basep) > +getdirentries (int fd, char *buf, size_t nbytes, off_t *basep) > { > - off_t base = __lseek (fd, (off_t) 0, SEEK_CUR); > - ssize_t result; > + off_t base = __lseek (fd, 0, SEEK_CUR); > > - result = __GETDENTS (fd, buf, nbytes); > + ssize_t result = __getdents (fd, buf, nbytes); > > if (result != -1) > *basep = base; > > return result; > } > + > +#endif > diff --git a/sysdeps/unix/sysv/linux/getdirentries64.c b/sysdeps/unix/sysv/linux/getdirentries64.c > index e486a36..c1a23a7 100644 > --- a/sysdeps/unix/sysv/linux/getdirentries64.c > +++ b/sysdeps/unix/sysv/linux/getdirentries64.c > @@ -1,3 +1,38 @@ > -#define GETDIRENTRIES getdirentries64 > -#define __GETDENTS __getdents64 > -#include "getdirentries.c" > +/* Copyright (C) 1993-2018 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define getdirentries __no_getdirentries_decl > +#include > +#undef getdirentries > +#include > + > +ssize_t > +getdirentries64 (int fd, char *buf, size_t nbytes, off64_t *basep) > +{ > + off64_t base = __lseek64 (fd, (off_t) 0, SEEK_CUR); > + > + ssize_t result = __getdents64 (fd, buf, nbytes); > + > + if (result != -1) > + *basep = base; > + > + return result; > +} > + > +#if _DIRENT_MATCHES_DIRENT64 > +weak_alias (getdirentries64, getdirentries) > +#endif > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c b/sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c > deleted file mode 100644 > index 298d1e9..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c > +++ /dev/null > @@ -1,3 +0,0 @@ > -#include "../getdirentries.c" > - > -weak_alias (getdirentries, getdirentries64) > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c b/sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c > deleted file mode 100644 > index 622baf0..0000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c > +++ /dev/null > @@ -1 +0,0 @@ > -/* Defined in getdirentries.c. */ >