mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 17:50:20 +00:00
5a82c74822
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
67 lines
2.2 KiB
C
67 lines
2.2 KiB
C
/* Copyright (C) 1993-2019 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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <stddef.h>
|
|
#include <dirent.h>
|
|
#include <unistd.h>
|
|
#include <endian.h>
|
|
#include <assert.h>
|
|
|
|
/* Read a directory entry from DIRP. */
|
|
struct dirent *
|
|
__readdir (DIR *dirp)
|
|
{
|
|
struct dirent64 *entry64 = __readdir64 (dirp);
|
|
|
|
if (sizeof (struct dirent64) == sizeof (struct dirent))
|
|
/* We should in fact just be an alias to readdir64 on this machine. */
|
|
return (struct dirent *) entry64;
|
|
|
|
/* These are all compile-time constants. We know that d_ino is the first
|
|
member and that the layout of the following members matches exactly in
|
|
both structures. */
|
|
assert (offsetof (struct dirent, d_ino) == 0);
|
|
assert (offsetof (struct dirent64, d_ino) == 0);
|
|
# define MATCH(memb) \
|
|
assert (offsetof (struct dirent64, memb) - sizeof (entry64->d_ino) \
|
|
== offsetof (struct dirent, memb) - sizeof (ino_t))
|
|
MATCH (d_reclen);
|
|
MATCH (d_type);
|
|
MATCH (d_namlen);
|
|
# undef MATCH
|
|
|
|
if (entry64 == NULL)
|
|
return NULL;
|
|
|
|
struct dirent *const entry = ((void *) (&entry64->d_ino + 1)
|
|
- sizeof entry->d_ino);
|
|
const ino_t d_ino = entry64->d_ino;
|
|
if (d_ino != entry64->d_ino)
|
|
{
|
|
__set_errno (EOVERFLOW);
|
|
return NULL;
|
|
}
|
|
# if BYTE_ORDER != BIG_ENDIAN /* We just skipped over the zero high word. */
|
|
entry->d_ino = d_ino; /* ... or the nonzero low word, swap it. */
|
|
# endif
|
|
entry->d_reclen -= sizeof entry64->d_ino - sizeof entry->d_ino;
|
|
return entry;
|
|
}
|
|
|
|
weak_alias (__readdir, readdir)
|