mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 01:40:07 +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
104 lines
2.8 KiB
C
104 lines
2.8 KiB
C
/* Common implementation for scandir{at}.
|
|
Copyright (C) 2018-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 <string.h>
|
|
#include <errno.h>
|
|
|
|
int
|
|
SCANDIR_TAIL (DIR *dp,
|
|
DIRENT_TYPE ***namelist,
|
|
int (*select) (const DIRENT_TYPE *),
|
|
int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **))
|
|
{
|
|
if (dp == NULL)
|
|
return -1;
|
|
|
|
int save = errno;
|
|
__set_errno (0);
|
|
|
|
int result;
|
|
struct scandir_cancel_struct c = { .dp = dp };
|
|
__libc_cleanup_push (&__scandir_cancel_handler, &c);
|
|
|
|
DIRENT_TYPE **v = NULL;
|
|
size_t vsize = 0;
|
|
DIRENT_TYPE *d;
|
|
while ((d = READDIR (dp)) != NULL)
|
|
{
|
|
if (select != NULL)
|
|
{
|
|
int selected = (*select) (d);
|
|
|
|
/* The SELECT function might have set errno to non-zero on
|
|
success. It was zero before and it needs to be again to
|
|
make the later tests work. */
|
|
__set_errno (0);
|
|
|
|
if (!selected)
|
|
continue;
|
|
}
|
|
|
|
if (__glibc_unlikely (c.cnt == vsize))
|
|
{
|
|
if (vsize == 0)
|
|
vsize = 10;
|
|
else
|
|
vsize *= 2;
|
|
DIRENT_TYPE **new = realloc (v, vsize * sizeof *v);
|
|
if (new == NULL)
|
|
break;
|
|
c.v = v = new;
|
|
}
|
|
|
|
size_t dsize = &d->d_name[_D_ALLOC_NAMLEN (d)] - (char *) d;
|
|
DIRENT_TYPE *vnew = malloc (dsize);
|
|
if (vnew == NULL)
|
|
break;
|
|
v[c.cnt++] = (DIRENT_TYPE *) memcpy (vnew, d, dsize);
|
|
|
|
/* Ignore errors from readdir, malloc or realloc. These functions
|
|
might have set errno to non-zero on success. It was zero before
|
|
and it needs to be again to make the latter tests work. */
|
|
__set_errno (0);
|
|
}
|
|
|
|
if (__glibc_likely (errno == 0))
|
|
{
|
|
__closedir (dp);
|
|
|
|
/* Sort the list if we have a comparison function to sort with. */
|
|
if (cmp != NULL)
|
|
qsort (v, c.cnt, sizeof *v, (__compar_fn_t) cmp);
|
|
|
|
*namelist = v;
|
|
result = c.cnt;
|
|
}
|
|
else
|
|
{
|
|
/* This frees everything and calls closedir. */
|
|
__scandir_cancel_handler (&c);
|
|
result = -1;
|
|
}
|
|
|
|
__libc_cleanup_pop (0);
|
|
|
|
if (result >= 0)
|
|
__set_errno (save);
|
|
return result;
|
|
}
|