mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 19:51:11 +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
112 lines
2.8 KiB
C
112 lines
2.8 KiB
C
/* Copyright (C) 2001-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 <dirent.h>
|
|
#include <stddef.h>
|
|
#include <string.h>
|
|
#include <hurd.h>
|
|
#include <hurd/fs.h>
|
|
#include <hurd/fd.h>
|
|
#include "dirstream.h"
|
|
|
|
/* Read a directory entry from DIRP. */
|
|
int
|
|
__readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
|
|
{
|
|
struct dirent64 *dp;
|
|
error_t err = 0;
|
|
|
|
if (dirp == NULL)
|
|
{
|
|
errno = EINVAL;
|
|
return errno;
|
|
}
|
|
|
|
__libc_lock_lock (dirp->__lock);
|
|
|
|
do
|
|
{
|
|
if (dirp->__ptr - dirp->__data >= dirp->__size)
|
|
{
|
|
/* We've emptied out our buffer. Refill it. */
|
|
|
|
char *data = dirp->__data;
|
|
int nentries;
|
|
|
|
if (err = HURD_FD_PORT_USE (dirp->__fd,
|
|
__dir_readdir (port,
|
|
&data, &dirp->__size,
|
|
dirp->__entry_ptr,
|
|
-1, 0, &nentries)))
|
|
{
|
|
__hurd_fail (err);
|
|
dp = NULL;
|
|
break;
|
|
}
|
|
|
|
/* DATA now corresponds to entry index DIRP->__entry_ptr. */
|
|
dirp->__entry_data = dirp->__entry_ptr;
|
|
|
|
if (data != dirp->__data)
|
|
{
|
|
/* The data was passed out of line, so our old buffer is no
|
|
longer useful. Deallocate the old buffer and reset our
|
|
information for the new buffer. */
|
|
__vm_deallocate (__mach_task_self (),
|
|
(vm_address_t) dirp->__data,
|
|
dirp->__allocation);
|
|
dirp->__data = data;
|
|
dirp->__allocation = round_page (dirp->__size);
|
|
}
|
|
|
|
/* Reset the pointer into the buffer. */
|
|
dirp->__ptr = dirp->__data;
|
|
|
|
if (nentries == 0)
|
|
{
|
|
/* End of file. */
|
|
dp = NULL;
|
|
break;
|
|
}
|
|
|
|
/* We trust the filesystem to return correct data and so we
|
|
ignore NENTRIES. */
|
|
}
|
|
|
|
dp = (struct dirent64 *) dirp->__ptr;
|
|
dirp->__ptr += dp->d_reclen;
|
|
++dirp->__entry_ptr;
|
|
|
|
/* Loop to ignore deleted files. */
|
|
} while (dp->d_fileno == 0);
|
|
|
|
if (dp)
|
|
{
|
|
*entry = *dp;
|
|
memcpy (entry->d_name, dp->d_name, dp->d_namlen + 1);
|
|
*result = entry;
|
|
}
|
|
else
|
|
*result = NULL;
|
|
|
|
__libc_lock_unlock (dirp->__lock);
|
|
|
|
return dp ? 0 : err ? errno : 0;
|
|
}
|
|
|
|
weak_alias (__readdir64_r, readdir64_r)
|