mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
40176158f1
The POSIX function scandir calls scandirat, which is not a POSIX function. This patch fixes this by making it use __scandirat and making scandirat a weak alias. There are no changes for scandir64 / scandirat64 because those are both _GNU_SOURCE-only functions so no namespace issue arises for them. Tested for x86_64 that the disassembly of installed shared libraries is unchanged by this patch. [BZ #17999] * dirent/scandir.c [!SCANDIR] (SCANDIRAT): Define to __scandirat instead of scandirat. * dirent/scandirat.c [!SCANDIRAT] (SCANDIRAT): Likewise. [!SCANDIRAT] (SCANDIRAT_WEAK_ALIAS): Define. [SCANDIRAT_WEAK_ALIAS] (scandirat): Define as weak alias of __scandirat. * include/dirent.h (scandirat): Do not use libc_hidden_proto. (__scandirat): Declare. Use libc_hidden_proto. * conform/Makefile (test-xfail-POSIX2008/dirent.h/linknamespace): Remove variable. (test-xfail-XOPEN2K8/dirent.h/linknamespace): Likewise.
49 lines
1.5 KiB
C
49 lines
1.5 KiB
C
/* Copyright (C) 1992-2015 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* We need to avoid the header declaration of scandir64, because
|
|
the types don't match scandir and then the compiler will
|
|
complain about the mismatch when we do the alias below. */
|
|
#define scandir64 __renamed_scandir64
|
|
|
|
#include <dirent.h>
|
|
|
|
#undef scandir64
|
|
|
|
#include <fcntl.h>
|
|
|
|
#ifndef SCANDIR
|
|
# define SCANDIR scandir
|
|
# define SCANDIRAT __scandirat
|
|
# define DIRENT_TYPE struct dirent
|
|
#endif
|
|
|
|
|
|
int
|
|
SCANDIR (dir, namelist, select, cmp)
|
|
const char *dir;
|
|
DIRENT_TYPE ***namelist;
|
|
int (*select) (const DIRENT_TYPE *);
|
|
int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **);
|
|
{
|
|
return SCANDIRAT (AT_FDCWD, dir, namelist, select, cmp);
|
|
}
|
|
|
|
#ifdef _DIRENT_MATCHES_DIRENT64
|
|
weak_alias (scandir, scandir64)
|
|
#endif
|