mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-19 03:20:05 +00:00
56ddf355da
2000-08-11 Ulrich Drepper <drepper@redhat.com> * rt/aio_cancel.c: If canceling a specific request which is running *really* do nothing. * rt/aio_misc.h: Add `done' to states of a request. * rt/aio_misc.c: Add several tests for the correct state. Simplify request table memory handling. 2000-08-10 Jakub Jelinek <jakub@redhat.com> * dirent/scandir.c: Use it for scandir64 and old_scandir64 as well. * dirent/scandir64.c: Move... * sysdeps/generic/scandir64.c: ...here. * dirent/alphasort64.c: Move... * sysdeps/generic/alphasort64.c: ...here. * dirent/versionsort64.c: Move... * sysdeps/generic/versionsort64.c: ...here. * sysdeps/unix/sysv/linux/i386/dirent/Versions (alphasort64, getdirentries64, readdir64, readdir64_r, scandir64, versionsort64): Export symbols at GLIBC_2.2. * sysdeps/unix/sysv/linux/powerpc/dirent/Versions: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/dirent/Versions: Likewise. * include/dirent.h (__readdir64_r, __scandir64, __alphasort64, __versionsort64): Add prototypes. * io/Versions (__xstat64, __fxstat64, __lxstat64): Export at GLIBC_2.2. * sysdeps/unix/sysv/linux/alpha/kernel_stat.h (__xstat_conv): Remove unused prototype. * sysdeps/unix/sysv/linux/alpha/readdir.c: Export at both GLIBC_2.1 and GLIBC_2.2. * sysdeps/unix/sysv/linux/alpha/readdir_r.c: Likewise. * sysdeps/unix/sysv/linux/alpha/getdents.c: New. * sysdeps/unix/sysv/linux/alpha/getdents64.c: New. * sysdeps/unix/sysv/linux/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/bits/stat.h (struct stat, struct stat64): Adjust for kernel-2.4.0-test6 layout. * sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat64): Export at both GLIBC_2.1 and GLIBC_2.2. * sysdeps/unix/sysv/linux/i386/lxstat.c (__lxstat64): Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/i386/getdents64.c: New. * sysdeps/unix/sysv/linux/i386/olddirent.h: New. * sysdeps/unix/sysv/linux/i386/readdir64.c: New. * sysdeps/unix/sysv/linux/i386/readdir64_r.c: New. * sysdeps/unix/sysv/linux/i386/scandir64.c: New. * sysdeps/unix/sysv/linux/i386/alphasort64.c: New. * sysdeps/unix/sysv/linux/i386/versionsort64.c: New. * sysdeps/unix/sysv/linux/ia64/getdents.c: New. * sysdeps/unix/sysv/linux/ia64/getdents64.c: New. * sysdeps/unix/sysv/linux/ia64/readdir.c: Include alpha/readdir.c. * sysdeps/unix/sysv/linux/ia64/readdir_r.c: Include alpha/readdir_r.c. * sysdeps/unix/sysv/linux/mips/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h: New. * sysdeps/unix/sysv/linux/powerpc/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/powerpc/scandir64.c: New. * sysdeps/unix/sysv/linux/powerpc/getdents64.c: New. * sysdeps/unix/sysv/linux/powerpc/readdir64.c: New. * sysdeps/unix/sysv/linux/powerpc/readdir64_r.c: New. * sysdeps/unix/sysv/linux/sparc/bits/types.h (__ino64_t): Change to __u_quad_t. * sysdeps/unix/sysv/linux/sparc/bits/stat.h: New. * sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/sparc/sparc32/getdents64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64_r.c: New. * sysdeps/unix/sysv/linux/sparc/sparc32/scandir64.c: New. * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/sparc/sparc64/readdir.c: Include alpha/readdir.c. * sysdeps/unix/sysv/linux/sparc/sparc64/readdir_r.c: Include alpha/readdir_r.c * sysdeps/unix/sysv/linux/sparc/sparc64/getdents.c: New. * sysdeps/unix/sysv/linux/sparc/sparc64/getdents64.c: New. * sysdeps/unix/sysv/linux/fxstat64.c (__fxstat64): If _HAVE_STAT64___ST_INO and __st_ino != (uint32_t)st_ino, set st_ino from __st_ino. * sysdeps/unix/sysv/linux/lxstat64.c (__lxstat64): Likewise. * sysdeps/unix/sysv/linux/xstat64.c (__xstat64): Likewise. * sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv, xstat64_conv, xstat32_conv): Use _HAVE_STAT* macros. If _HAVE_STAT64___ST_INO, set __st_ino in addition to st_ino. * sysdeps/unix/sysv/linux/kernel_stat.h (_HAVE_STAT*): Define. * sysdeps/unix/sysv/linux/getdents.c: Use it for __getdents64 and __old_getdents64 as well. * sysdeps/unix/sysv/linux/getdirentries.c: Use it for getdirentries64 and old_getdirentries64 as well. * sysdeps/unix/sysv/linux/getdirentries64.c (GETDIRENTRIES, __GETDENTS): Define. (GETDENTS64): Remove. * sysdeps/unix/sysv/linux/getdents64.c (__GETDENTS, DIRENT_TYPE): Define. (GETDENTS64): Remove. * sysdeps/unix/sysv/linux/readdir64.c: Use sysdeps/unix/readdir.c. * sysdeps/unix/sysv/linux/readdir64_r.c: Use sysdeps/unix/readdir_r.c. * sysdeps/unix/readdir.c: Use it for readdir64 and __old_readdir64 as well. * sysdeps/unix/readdir_r.c: Use it for readdir64_r and __old_readdir64_r as well. * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_ST_INO_64_bit for kernel 2.4.1 and up. * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Add SI_KERNEL define.
135 lines
4.2 KiB
C
135 lines
4.2 KiB
C
/* Copyright (C) 1993, 95, 96, 97, 98, 99, 2000 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <alloca.h>
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <dirent.h>
|
|
#include <stddef.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/param.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <sysdep.h>
|
|
#include <sys/syscall.h>
|
|
#include <bp-checks.h>
|
|
|
|
#include <linux/posix_types.h>
|
|
|
|
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
|
|
|
|
extern int __syscall_getdents (int fd, char *__unbounded buf, size_t nbytes);
|
|
|
|
/* For Linux we need a special version of this file since the
|
|
definition of `struct dirent' is not the same for the kernel and
|
|
the libc. There is one additional field which might be introduced
|
|
in the kernel structure in the future.
|
|
|
|
Here is the kernel definition of `struct dirent' as of 2.1.20: */
|
|
|
|
struct kernel_dirent
|
|
{
|
|
long int d_ino;
|
|
__kernel_off_t d_off;
|
|
unsigned short int d_reclen;
|
|
char d_name[256];
|
|
};
|
|
|
|
#ifndef __GETDENTS
|
|
# define __GETDENTS __getdents
|
|
# define DIRENT_TYPE struct dirent
|
|
#endif
|
|
#ifndef DIRENT_SET_DP_INO
|
|
# define DIRENT_SET_DP_INO(dp, value) (dp)->d_ino = (value)
|
|
#endif
|
|
|
|
/* The problem here is that we cannot simply read the next NBYTES
|
|
bytes. We need to take the additional field into account. We use
|
|
some heuristic. Assuming the directory contains names with 14
|
|
characters on average we can compute an estimated number of entries
|
|
which fit in the buffer. Taking this number allows us to specify a
|
|
reasonable number of bytes to read. If we should be wrong, we can
|
|
reset the file descriptor. In practice the kernel is limiting the
|
|
amount of data returned much more then the reduced buffer size. */
|
|
ssize_t
|
|
internal_function
|
|
__GETDENTS (int fd, char *buf, size_t nbytes)
|
|
{
|
|
off_t last_offset = -1;
|
|
size_t red_nbytes;
|
|
struct kernel_dirent *skdp, *kdp;
|
|
DIRENT_TYPE *dp;
|
|
int retval;
|
|
const size_t size_diff = (offsetof (DIRENT_TYPE, d_name)
|
|
- offsetof (struct kernel_dirent, d_name));
|
|
|
|
red_nbytes = MIN (nbytes
|
|
- ((nbytes / (offsetof (DIRENT_TYPE, d_name) + 14))
|
|
* size_diff),
|
|
nbytes - size_diff);
|
|
|
|
dp = (DIRENT_TYPE *) buf;
|
|
skdp = kdp = __alloca (red_nbytes);
|
|
|
|
retval = INLINE_SYSCALL (getdents, 3, fd,
|
|
CHECK_N ((char *) kdp, red_nbytes), red_nbytes);
|
|
|
|
if (retval == -1)
|
|
return -1;
|
|
|
|
while ((char *) kdp < (char *) skdp + retval)
|
|
{
|
|
const size_t alignment = __alignof__ (DIRENT_TYPE);
|
|
/* Since kdp->d_reclen is already aligned for the kernel structure
|
|
this may compute a value that is bigger than necessary. */
|
|
size_t new_reclen = ((kdp->d_reclen + size_diff + alignment - 1)
|
|
& ~(alignment - 1));
|
|
if ((char *) dp + new_reclen > buf + nbytes)
|
|
{
|
|
/* Our heuristic failed. We read too many entries. Reset
|
|
the stream. */
|
|
assert (last_offset != -1);
|
|
__lseek (fd, last_offset, SEEK_SET);
|
|
|
|
if ((char *) dp == buf)
|
|
{
|
|
/* The buffer the user passed in is too small to hold even
|
|
one entry. */
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
last_offset = kdp->d_off;
|
|
DIRENT_SET_DP_INO(dp, kdp->d_ino);
|
|
dp->d_off = kdp->d_off;
|
|
dp->d_reclen = new_reclen;
|
|
dp->d_type = DT_UNKNOWN;
|
|
memcpy (dp->d_name, kdp->d_name,
|
|
kdp->d_reclen - offsetof (struct kernel_dirent, d_name));
|
|
|
|
dp = (DIRENT_TYPE *) ((char *) dp + new_reclen);
|
|
kdp = (struct kernel_dirent *) (((char *) kdp) + kdp->d_reclen);
|
|
}
|
|
|
|
return (char *) dp - buf;
|
|
}
|