OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consolidate getdirentries{64} implementation

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella 2018-03-01 18:22:16 -03:00
parent 42a2bf58ff
commit 7d80f48e93
5 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2018-04-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* 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.
2018-04-25 Joseph Myers <joseph@codesourcery.com> 2018-04-25 Joseph Myers <joseph@codesourcery.com>
* scripts/build-many-glibcs.py (Context.checkout): Default GCC * scripts/build-many-glibcs.py (Context.checkout): Default GCC

19
sysdeps/unix/sysv/linux/getdirentries.c
View File

@ -16,26 +16,21 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <dirent.h> #include <dirent.h>
#include <unistd.h>
#ifndef GETDIRENTRIES #if !_DIRENT_MATCHES_DIRENT64
# define GETDIRENTRIES getdirentries # include <unistd.h>
# define __GETDENTS __getdents
#else
# define off_t off64_t
# define __lseek __lseek64
#endif
ssize_t 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); off_t base = __lseek (fd, 0, SEEK_CUR);
ssize_t result;
result = __GETDENTS (fd, buf, nbytes); ssize_t result = __getdents (fd, buf, nbytes);
if (result != -1) if (result != -1)
*basep = base; *basep = base;
return result; return result;
} }
#endif

42
sysdeps/unix/sysv/linux/getdirentries64.c
View File

@ -1,3 +1,39 @@
#define GETDIRENTRIES getdirentries64 /* Get directory entries in a filesystem-independent format. LFS version.
#define __GETDENTS __getdents64 Copyright (C) 1993-2018 Free Software Foundation, Inc.
#include "getdirentries.c" 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
<http://www.gnu.org/licenses/>. */
#define getdirentries __no_getdirentries_decl
#include <dirent.h>
#undef getdirentries
#include <unistd.h>
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

3
sysdeps/unix/sysv/linux/wordsize-64/getdirentries.c
View File

@ -1,3 +0,0 @@
#include "../getdirentries.c"
weak_alias (getdirentries, getdirentries64)

1
sysdeps/unix/sysv/linux/wordsize-64/getdirentries64.c
View File

@ -1 +0,0 @@
/* Defined in getdirentries.c. */