mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-12 22:30:12 +00:00
4a244f0dce
2003-09-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/alpha/Makefile (sysdep_routines): Remove rt_sigsuspend, rt_sigprocmask, rt_sigtimedwait, rt_sigqueueinfo and rt_sigpending. * sysdeps/unix/sysv/linux/alpha/sigaction.c (__syscall_rt_sigaction): New prototype. * sysdeps/unix/sysv/linux/arm/syscalls.list (__syscall_*): Remove unused __syscall_ stubs. * sysdeps/unix/sysv/linux/arm/Makefile (sysdep_routines): Remove rt_*. * sysdeps/unix/sysv/linux/cris/Makefile: Removed. * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (__syscall_recvfrom, __syscall_sendto): Remove unused aliases. * sysdeps/unix/sysv/linux/mips/syscalls.list (__syscall_*): Remove unused __syscall_ stubs. * sysdeps/unix/sysv/linux/mips/Makefile (sysdep_routines): Remove rt_*. * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list (__syscall_*): Remove unused __syscall_ stubs. * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list (__syscall_*): Likewise. * sysdeps/unix/sysv/linux/powerpc/Makefile (sysdep_routines): Remove rt_*. * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (__syscall_*): Remove unused __syscall_ stubs. * sysdeps/unix/sysv/linux/sh/Makefile (sysdep_routines): Remove rt_*. * sysdeps/unix/sysv/linux/rt_sigaction.c: Removed. * sysdeps/unix/sysv/linux/rt_sigpending.c: Removed. * sysdeps/unix/sysv/linux/rt_sigprocmask.c: Removed. * sysdeps/unix/sysv/linux/rt_sigqueueinfo.c: Removed. * sysdeps/unix/sysv/linux/rt_sigreturn.c: Removed. * sysdeps/unix/sysv/linux/rt_sigsuspend.c: Removed. * sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Removed. * sysdeps/unix/sysv/linux/s_pread64.c: Removed. * sysdeps/unix/sysv/linux/s_pwrite64.c: Removed. * sysdeps/unix/sysv/linux/alpha/gethostname.c: Remove unused __syscall_* prototypes. * sysdeps/unix/sysv/linux/alpha/ipc_priv.h: Likewise. * sysdeps/unix/sysv/linux/alpha/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/alpha/semctl.c: Likewise. * sysdeps/unix/sysv/linux/alpha/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/arm/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/i386/chown.c: Likewise. * sysdeps/unix/sysv/linux/i386/fchown.c: Likewise. * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/getegid.c: Likewise. * sysdeps/unix/sysv/linux/i386/geteuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/getgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/getgroups.c: Likewise. * sysdeps/unix/sysv/linux/i386/getmsg.c: Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/getresgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/getresuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/getrlimit.c: Likewise. * sysdeps/unix/sysv/linux/i386/getuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/lchown.c: Likewise. * sysdeps/unix/sysv/linux/i386/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/putmsg.c: Likewise. * sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setgroups.c: Likewise. * sysdeps/unix/sysv/linux/i386/setregid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setresgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setresuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setreuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setrlimit.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/ia64/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/ia64/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/ia64/xstat.c: Likewise. * sysdeps/unix/sysv/linux/m68k/chown.c: Likewise. * sysdeps/unix/sysv/linux/mips/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise. * sysdeps/unix/sysv/linux/mips/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/mips/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/ustat.c: Likewise. * sysdeps/unix/sysv/linux/mips/xmknod.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/ioctl.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/chown.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/lchown.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/xstat.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/execve.c: Likewise. * sysdeps/unix/sysv/linux/aio_sigqueue.c: Likewise. * sysdeps/unix/sysv/linux/reboot.c: Likewise. * sysdeps/unix/sysv/linux/_exit.c: Likewise. * sysdeps/unix/sysv/linux/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/fxstat64.c: Likewise. * sysdeps/unix/sysv/linux/gai_sigqueue.c: Likewise. * sysdeps/unix/sysv/linux/readahead.c: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Likewise. * sysdeps/unix/sysv/linux/sigwait.c: Likewise. * sysdeps/unix/sysv/linux/getdents.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/unix/sysv/linux/getpriority.c: Likewise. * sysdeps/unix/sysv/linux/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/ipc_priv.h: Likewise. * sysdeps/unix/sysv/linux/llseek.c: Likewise. * sysdeps/unix/sysv/linux/sysctl.c: Likewise. * sysdeps/unix/sysv/linux/lxstat64.c: Likewise. * sysdeps/unix/sysv/linux/mmap64.c: Likewise. * sysdeps/unix/sysv/linux/ustat.c: Likewise. * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigqueue.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. * sysdeps/unix/sysv/linux/truncate64.c: Likewise. * sysdeps/unix/sysv/linux/xmknod.c: Likewise. * sysdeps/unix/sysv/linux/xstat64.c: Likewise. 2003-09-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Revert last change. * sysdeps/unix/sysv/linux/powerpc/syscalls.list: New file. * sysdeps/unix/sysv/linux/sparc/syscalls.list: New file. * stdio-common/Makefile (CFLAGS-vprintf.c): Add -fexceptions. * intl/loadmsgcat.c: For _LIBC, call not cancelable versions of open, close, and read.
267 lines
7.8 KiB
C
267 lines
7.8 KiB
C
/* Copyright (C) 1993, 1995-2002, 2003 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 <alloca.h>
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <dirent.h>
|
|
#include <stddef.h>
|
|
#include <stdint.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>
|
|
|
|
#include "kernel-features.h"
|
|
|
|
#ifdef __NR_getdents64
|
|
#ifndef __ASSUME_GETDENTS64_SYSCALL
|
|
#ifndef __GETDENTS
|
|
/* The variable is shared between all *getdents* calls. */
|
|
int __have_no_getdents64;
|
|
#else
|
|
extern int __have_no_getdents64;
|
|
#endif
|
|
#endif
|
|
#endif
|
|
|
|
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
|
|
|
|
/* 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];
|
|
};
|
|
|
|
struct kernel_dirent64
|
|
{
|
|
uint64_t d_ino;
|
|
int64_t d_off;
|
|
unsigned short int d_reclen;
|
|
unsigned char d_type;
|
|
char d_name[256];
|
|
};
|
|
|
|
#ifndef __GETDENTS
|
|
# define __GETDENTS __getdents
|
|
#endif
|
|
#ifndef DIRENT_TYPE
|
|
# 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)
|
|
{
|
|
off64_t last_offset = -1;
|
|
ssize_t retval;
|
|
|
|
#ifdef __NR_getdents64
|
|
# ifndef __ASSUME_GETDENTS64_SYSCALL
|
|
if (!__have_no_getdents64)
|
|
# endif
|
|
{
|
|
# ifndef __ASSUME_GETDENTS64_SYSCALL
|
|
int saved_errno = errno;
|
|
# endif
|
|
union
|
|
{
|
|
struct kernel_dirent64 k;
|
|
DIRENT_TYPE u;
|
|
char b[1];
|
|
} *kbuf = (void *) buf, *outp, *inp;
|
|
size_t kbytes = nbytes;
|
|
if (offsetof (DIRENT_TYPE, d_name)
|
|
< offsetof (struct kernel_dirent64, d_name)
|
|
&& nbytes <= sizeof (DIRENT_TYPE))
|
|
{
|
|
kbytes = nbytes + offsetof (struct kernel_dirent64, d_name)
|
|
- offsetof (DIRENT_TYPE, d_name);
|
|
kbuf = __alloca(kbytes);
|
|
}
|
|
retval = INLINE_SYSCALL (getdents64, 3, fd, CHECK_N(kbuf, kbytes),
|
|
kbytes);
|
|
# ifndef __ASSUME_GETDENTS64_SYSCALL
|
|
if (retval != -1 || (errno != EINVAL && errno != ENOSYS))
|
|
# endif
|
|
{
|
|
const size_t size_diff = (offsetof (struct kernel_dirent64, d_name)
|
|
- offsetof (DIRENT_TYPE, d_name));
|
|
|
|
/* Return the error if encountered. */
|
|
if (retval == -1)
|
|
return -1;
|
|
|
|
/* If the structure returned by the kernel is identical to what we
|
|
need, don't do any conversions. */
|
|
if (offsetof (DIRENT_TYPE, d_name)
|
|
== offsetof (struct kernel_dirent64, d_name)
|
|
&& sizeof (outp->u.d_ino) == sizeof (inp->k.d_ino)
|
|
&& sizeof (outp->u.d_off) == sizeof (inp->k.d_off))
|
|
return retval;
|
|
|
|
/* These two pointers might alias the same memory buffer.
|
|
Standard C requires that we always use the same type for them,
|
|
so we must use the union type. */
|
|
inp = kbuf;
|
|
outp = (void *) buf;
|
|
|
|
while (&inp->b < &kbuf->b + retval)
|
|
{
|
|
const size_t alignment = __alignof__ (DIRENT_TYPE);
|
|
/* Since inp->k.d_reclen is already aligned for the kernel
|
|
structure this may compute a value that is bigger
|
|
than necessary. */
|
|
size_t old_reclen = inp->k.d_reclen;
|
|
size_t new_reclen = ((old_reclen - size_diff + alignment - 1)
|
|
& ~(alignment - 1));
|
|
|
|
/* Copy the data out of the old structure into temporary space.
|
|
Then copy the name, which may overlap if BUF == KBUF. */
|
|
const uint64_t d_ino = inp->k.d_ino;
|
|
const int64_t d_off = inp->k.d_off;
|
|
const uint8_t d_type = inp->k.d_type;
|
|
|
|
memmove (outp->u.d_name, inp->k.d_name,
|
|
old_reclen - offsetof (struct kernel_dirent64, d_name));
|
|
|
|
/* Now we have copied the data from INP and access only OUTP. */
|
|
|
|
DIRENT_SET_DP_INO (&outp->u, d_ino);
|
|
outp->u.d_off = d_off;
|
|
if ((sizeof (outp->u.d_ino) != sizeof (inp->k.d_ino)
|
|
&& outp->u.d_ino != d_ino)
|
|
|| (sizeof (outp->u.d_off) != sizeof (inp->k.d_off)
|
|
&& outp->u.d_off != d_off))
|
|
{
|
|
/* Overflow. If there was at least one entry
|
|
before this one, return them without error,
|
|
otherwise signal overflow. */
|
|
if (last_offset != -1)
|
|
{
|
|
__lseek64 (fd, last_offset, SEEK_SET);
|
|
return outp->b - buf;
|
|
}
|
|
__set_errno (EOVERFLOW);
|
|
return -1;
|
|
}
|
|
|
|
last_offset = d_off;
|
|
outp->u.d_reclen = new_reclen;
|
|
outp->u.d_type = d_type;
|
|
|
|
inp = (void *) inp + old_reclen;
|
|
outp = (void *) outp + new_reclen;
|
|
}
|
|
|
|
return outp->b - buf;
|
|
}
|
|
|
|
# ifndef __ASSUME_GETDENTS64_SYSCALL
|
|
__set_errno (saved_errno);
|
|
__have_no_getdents64 = 1;
|
|
# endif
|
|
}
|
|
#endif
|
|
{
|
|
size_t red_nbytes;
|
|
struct kernel_dirent *skdp, *kdp;
|
|
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);
|
|
|
|
skdp = kdp = __alloca (red_nbytes);
|
|
|
|
retval = INLINE_SYSCALL (getdents, 3, fd,
|
|
CHECK_N ((char *) kdp, red_nbytes), red_nbytes);
|
|
|
|
if (retval == -1)
|
|
return -1;
|
|
|
|
DIRENT_TYPE *dp = (DIRENT_TYPE *) buf;
|
|
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);
|
|
__lseek64 (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;
|
|
}
|
|
}
|