mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 01:40:07 +00:00
ffa8d2a098
name of "", store a null pointer instead. * configure.in (elf): Set to yes for freebsd*, netbsd*. * configure: Regenerated. * locale/xlocale.c [! (USE_TLS && HAVE___THREAD)] (__libc_tsd_LOCALE): Initialize this instead of __libc_tsd_LOCALE_data. * sysdeps/unix/grantpt.c (pts_name): Convert ENOTTY return from ptsname_r to EINVAL. * sysdeps/generic/ptsname.c (__ptsname_r): Return ENOSYS instead of 0. * rt/Makefile: Revert last change, it was inappropriate to presume aio implementations depend on pthreads. * rt/tst-aio.c (do_test): Exit happy if first failure is ENOSYS. * rt/tst-aio64.c (do_test): Likewise. * rt/tst-aio2.c (do_test): Likewise. * rt/tst-aio3.c (do_test): Likewise. * rt/tst-aio4.c (do_test): Likewise. * rt/tst-aio5.c (do_test): Likewise. * rt/tst-aio6.c (do_test): Likewise. * rt/tst-aio7.c (do_test): Likewise. * sysdeps/generic/bits/libc-lock.h (__libc_setspecific): Use a cast to void so as to avoid compiler warnings. * libio/oldstdfiles.c [! _IO_MTSAFE_IO] (DEF_STDFILE): Don't define _IO_wide_data_FD, which is never used here. * libio/iofread.c [! _IO_MTSAFE_IO] (fread_unlocked): Add libc_hidden_ver defn. * libio/iofputs.c [! _IO_MTSAFE_IO] (fputs_unlocked): Likewise. * libio/iofgets.c [! _IO_MTSAFE_IO] (fgets_unlocked): Likewise. * include/resolv.h [! _LIBC_REENTRANT] (_res): #undef it before decl. * include/netdb.h [! _LIBC_REENTRANT] (h_errno): Declare normal extern. * misc/syslog.c (openlog): Conditionalize locking on [_LIBC_REENTRANT]. (closelog): Likewise. 2002-07-06 Bruno Haible <bruno@clisp.org> * sysdeps/alpha/fpu/fpu_control.h: Comment fix. * sysdeps/unix/sysv/linux/alpha/pipe.S: Moved to ... * sysdeps/unix/alpha/pipe.S: ... here. * sysdeps/unix/bsd/osf/alpha/pipe.S: File removed. * sysdeps/unix/i386/brk.S: Rename local label to '.Lhere' in ELF. * sysdeps/unix/i386/brk.S: Add PSEUDO_END invocation. * sysdeps/unix/i386/fork.S: Likewise. * sysdeps/unix/i386/pipe.S: Likewise. * sysdeps/unix/i386/wait.S: Likewise. * sysdeps/unix/fork.S: Fix PSEUDO_END argument. * sysdeps/unix/arm/fork.S: Likewise. * sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/hppa/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/sh/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/unix/sysv/linux/x86_64/sysdep.h (PSEUDO): Swap DO_CALL arguments. (DO_CALL): Swap argument order. * sysdeps/i386/sysdep.h (PSEUDO): Fix syntax error. (L): Define right for ELF. * sysdeps/unix/sysv/linux/i386/sysdep.h (L): Remove definition. Now defined in sysdeps/i386/sysdep.h. * sysdeps/posix/readv.c: Ansify function definition. * sysdeps/posix/writev.c: Likewise. * stdio-common/tst-fseek.c (main): Don't assume that off_t and size_t have the same size. Avoid direct cast from size_t to off_t. * login/tst-utmp.c (simulate_login): Don't leave garbage after the nul byte in entry[n].ut_user. (simulate_logout): Likewise. * login/programs/utmpdump.c (print_entry): Test _HAVE_UT_TYPE, _HAVE_UT_PID, _HAVE_UT_ID, _HAVE_UT_HOST, instead of assuming the existence of corresponding members of 'struct utmp'. * login/tst-utmp.c: Trivialize the test if testing 'struct utmp' and !_HAVE_UT_TYPE. * sysdeps/unix/opendir.c (__opendir): If st_blksize is 0 or too small, allocate a buffer of at least BUFSIZ bytes, not just of sizeof (struct dirent). * sysdeps/generic/glob.c: Include <limits.h>. (NAME_MAX): Define a fallback. (glob_in_dir): Allocate enough room for a 'struct dirent64' on the stack. * posix/tst-dir.c: Include <stddef.h>, for offsetof. (main): Allocate enough room for a 'struct dirent64' on the stack. * posix/tst-gnuglob.c (my_DIR): Allocate enough room for a 'struct dirent'. * sysdeps/unix/sysv/linux/init-first.c: Don't include kernel-features.h. * inet/htontest.c: Include <sys/types.h>. * sysdeps/generic/sys/sysinfo.h: Surround with __{BEGIN,END}_DECLS. * include/sys/sysctl.h: Comment fix. * elf/rtld.c (_rtld_global) [! _LIBC_REENTRANT]: Don't initialize _dl_load_lock. * libio/fileno.c (fileno_unlocked): Define regardless of _IO_MTSAFE_IO. * sysdeps/unix/bsd/bsd4.4/syscalls.list (__sigaltstack): New alias. * sysdeps/unix/inet/syscalls.list (__connect_internal): New alias. (__getpeername): New alias. (__getsockname): New alias. (__socket): New alias. * sysdeps/unix/common/syscalls.list (getpgid): Remove. * sysdeps/unix/syscalls.list (__chown_internal): New alias. (__fcntl_internal): New alias. (__profil): New alias.
164 lines
4.5 KiB
C
164 lines
4.5 KiB
C
/* Copyright (C) 1991-1996,98,2000-2002 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <dirent.h>
|
|
#include <fcntl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
|
|
#include <dirstream.h>
|
|
|
|
/* opendir() must not accidentally open something other than a directory.
|
|
Some OS's have kernel support for that, some don't. In the worst
|
|
case we have to stat() before the open() AND fstat() after.
|
|
|
|
We have to test at runtime for kernel support since libc may have
|
|
been compiled with different headers to the kernel it's running on.
|
|
This test can't be done reliably in the general case. We'll use
|
|
/dev/null, which if it's not a device lots of stuff will break, as
|
|
a guinea pig. It may be missing in chroot environments, so we
|
|
make sure to fail safe. */
|
|
#ifdef O_DIRECTORY
|
|
# ifdef O_DIRECTORY_WORKS
|
|
# define o_directory_works 1
|
|
# define tryopen_o_directory() while (1) /* This must not be called. */
|
|
# else
|
|
static int o_directory_works;
|
|
|
|
static void
|
|
tryopen_o_directory (void)
|
|
{
|
|
int serrno = errno;
|
|
int x = __open ("/dev/null", O_RDONLY|O_NDELAY|O_DIRECTORY);
|
|
|
|
if (x >= 0)
|
|
{
|
|
__close (x);
|
|
o_directory_works = -1;
|
|
}
|
|
else if (errno != ENOTDIR)
|
|
o_directory_works = -1;
|
|
else
|
|
o_directory_works = 1;
|
|
|
|
__set_errno (serrno);
|
|
}
|
|
# endif
|
|
# define EXTRA_FLAGS O_DIRECTORY
|
|
#else
|
|
# define EXTRA_FLAGS 0
|
|
#endif
|
|
|
|
|
|
/* Open a directory stream on NAME. */
|
|
DIR *
|
|
__opendir (const char *name)
|
|
{
|
|
DIR *dirp;
|
|
struct stat64 statbuf;
|
|
int fd;
|
|
size_t allocation;
|
|
int save_errno;
|
|
|
|
if (__builtin_expect (name[0], '\1') == '\0')
|
|
{
|
|
/* POSIX.1-1990 says an empty name gets ENOENT;
|
|
but `open' might like it fine. */
|
|
__set_errno (ENOENT);
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef O_DIRECTORY
|
|
/* Test whether O_DIRECTORY works. */
|
|
if (o_directory_works == 0)
|
|
tryopen_o_directory ();
|
|
|
|
/* We can skip the expensive `stat' call if O_DIRECTORY works. */
|
|
if (o_directory_works < 0)
|
|
#endif
|
|
{
|
|
/* We first have to check whether the name is for a directory. We
|
|
cannot do this after the open() call since the open/close operation
|
|
performed on, say, a tape device might have undesirable effects. */
|
|
if (__builtin_expect (__xstat64 (_STAT_VER, name, &statbuf), 0) < 0)
|
|
return NULL;
|
|
if (__builtin_expect (! S_ISDIR (statbuf.st_mode), 0))
|
|
{
|
|
__set_errno (ENOTDIR);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
fd = __open64 (name, O_RDONLY|O_NDELAY|EXTRA_FLAGS);
|
|
if (__builtin_expect (fd, 0) < 0)
|
|
return NULL;
|
|
|
|
/* Now make sure this really is a directory and nothing changed since
|
|
the `stat' call. We do not have to perform the test for the
|
|
descriptor being associated with a directory if we know the
|
|
O_DIRECTORY flag is honored by the kernel. */
|
|
if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &statbuf), 0) < 0)
|
|
goto lose;
|
|
#ifdef O_DIRECTORY
|
|
if (o_directory_works <= 0)
|
|
#endif
|
|
{
|
|
if (__builtin_expect (! S_ISDIR (statbuf.st_mode), 0))
|
|
{
|
|
save_errno = ENOTDIR;
|
|
goto lose;
|
|
}
|
|
}
|
|
|
|
if (__builtin_expect (__fcntl (fd, F_SETFD, FD_CLOEXEC), 0) < 0)
|
|
goto lose;
|
|
|
|
#ifdef _STATBUF_ST_BLKSIZE
|
|
if (__builtin_expect ((size_t) statbuf.st_blksize >= sizeof (struct dirent),
|
|
1))
|
|
allocation = statbuf.st_blksize;
|
|
else
|
|
#endif
|
|
allocation = (BUFSIZ < sizeof (struct dirent)
|
|
? sizeof (struct dirent) : BUFSIZ);
|
|
|
|
dirp = (DIR *) calloc (1, sizeof (DIR) + allocation); /* Zero-fill. */
|
|
if (dirp == NULL)
|
|
lose:
|
|
{
|
|
save_errno = errno;
|
|
(void) __close (fd);
|
|
__set_errno (save_errno);
|
|
return NULL;
|
|
}
|
|
dirp->data = (char *) (dirp + 1);
|
|
dirp->allocation = allocation;
|
|
dirp->fd = fd;
|
|
|
|
__libc_lock_init (dirp->lock);
|
|
|
|
return dirp;
|
|
}
|
|
weak_alias (__opendir, opendir)
|