mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-30 06:21:07 +00:00
0dee67386c
1998-10-21 14:38 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysdep.h (INLINE_SYSCALL): New macro. Simply call __syscall_* function. * sysdeps/unix/sysv/linux/aio_sigqueue.c: Use INLINE_SYSCALL instead of calling __syscall_* function. * sysdeps/unix/sysv/linux/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/fxstat64.c: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Likewise. * sysdeps/unix/sysv/linux/getdents.c: Likewise. * sysdeps/unix/sysv/linux/getpriority.c: Likewise. * sysdeps/unix/sysv/linux/getresgid.c: Likewise. * sysdeps/unix/sysv/linux/getresuid.c: Likewise. * sysdeps/unix/sysv/linux/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/lxstat64.c: Likewise. * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/unix/sysv/linux/reboot.c: Likewise. * sysdeps/unix/sysv/linux/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/siglist.h: 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/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sysctl.c: Likewise. * sysdeps/unix/sysv/linux/ustat.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise. * sysdeps/unix/sysv/linux/xmknod.c: Likewise. * sysdeps/unix/sysv/linux/xstat.c: Likewise. * sysdeps/unix/sysv/linux/xstat64.c: Likewise. * sysdeps/unix/sysv/linux/i386/chown.c: Likewise. * sysdeps/unix/sysv/linux/i386/getgroups.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/setresgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setresuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Define INLINE_SYSCALL using inline assembler. * sysdeps/unix/sysv/linux/i386/syscalls.list: Remove various __syscall_* definitions. * sysdeps/unix/sysv/linux/syscalls.list: Move various __syscall_* definitions to... * sysdeps/unix/sysv/linux/alpha/syscalls.list: ...here... * sysdeps/unix/sysv/linux/arm/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/m68k/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/mips/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/powerpc/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: ...and here. * sysdeps/unix/sysv/linux/i386/Makefile [subdir=misc] (sysdep_routines): Remove s_pread64 and s_pwrite64. * sysdeps/unix/sysv/linux/i386/pread.c: New file. * sysdeps/unix/sysv/linux/i386/pread64.c: New file. * sysdeps/unix/sysv/linux/i386/pwrite.c: New file. * sysdeps/unix/sysv/linux/i386/pwrite64.c: New file. * sysdeps/unix/sysv/linux/i386/s_pread64.S: Removed. * sysdeps/unix/sysv/linux/i386/s_pwrite64.S: Removed. 1998-10-21 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/siglist.h: Fix some typos in these files and bring them in synch. * sysdeps/unix/siglist.c: Likewise. Reported by Vladimir Michl <michlv@risc.upol.cz> [PR libc/832]. 1998-10-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * sysdeps/unix/sysv/linux/i386/setresuid.c: Allow -1 as arguments. * sysdeps/unix/sysv/linux/i386/setresgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setreuid.c: New file. * sysdeps/unix/sysv/linux/i386/setregid.c: New file. * sysdeps/unix/sysv/linux/m68k/setreuid.c: New file. * sysdeps/unix/sysv/linux/m68k/setregid.c: New file. * sysdeps/unix/sysv/linux/arm/setreuid.c: New file. * sysdeps/unix/sysv/linux/arm/setregid.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc32/setreuid.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc32/setregid.c: New file. * sysdeps/unix/sysv/linux/i386/syscalls.list: Add s_setreuid and s_setregid. * sysdeps/unix/sysv/linux/m68k/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: Likewise. 1998-10-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * sunrpc/rpc_main.c (close_output, close_input): New functions. (c_output, h_output, s_output, l_output, t_output, svc_output, clnt_output, mkfile_output): Call them at the end. 1998-10-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * db/Makefile (LDFLAGS-db1.so): New variable, to avoid duplicating link command. 1998-10-18 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/unix/opendir.c: Check at runtime for kernel support for O_DIRECTORY. 1998-10-20 H.J. Lu <hjl@gnu.org> * sysdeps/unix/sysv/linux/i386/setresuid.c (__setresuid): Fix argument types.
121 lines
3.8 KiB
C
121 lines
3.8 KiB
C
/* Copyright (C) 1993, 1995, 1996, 1997, 1998 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 <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 <linux/posix_types.h>
|
|
|
|
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
|
|
|
|
|
|
extern int __syscall_getdents __P ((int fd, char *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];
|
|
};
|
|
|
|
#ifdef GETDENTS64
|
|
#define __getdirentries __getdirentries64
|
|
#define dirent dirent64
|
|
#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 estimate number of entries
|
|
which fit in the buffer. Taking this number allows us to specify a
|
|
correct number of bytes to read. If we should be wrong, we can reset
|
|
the file descriptor. */
|
|
ssize_t
|
|
__getdirentries (int fd, char *buf, size_t nbytes, off_t *basep)
|
|
{
|
|
off_t base = __lseek (fd, (off_t) 0, SEEK_CUR);
|
|
off_t last_offset = base;
|
|
size_t red_nbytes;
|
|
struct kernel_dirent *skdp, *kdp;
|
|
struct dirent *dp;
|
|
int retval;
|
|
const size_t size_diff = (offsetof (struct dirent, d_name)
|
|
- offsetof (struct kernel_dirent, d_name));
|
|
|
|
red_nbytes = nbytes - ((nbytes / (offsetof (struct dirent, d_name) + 14))
|
|
* size_diff);
|
|
|
|
dp = (struct dirent *) buf;
|
|
skdp = kdp = __alloca (red_nbytes);
|
|
|
|
retval = INLINE_SYSCALL (getdents, 3, fd, (char *) kdp, red_nbytes);
|
|
|
|
while ((char *) kdp < (char *) skdp + retval)
|
|
{
|
|
const size_t alignment = __alignof__ (struct dirent);
|
|
/* 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. */
|
|
__lseek (fd, last_offset, SEEK_SET);
|
|
break;
|
|
}
|
|
|
|
last_offset = kdp->d_off;
|
|
dp->d_ino = 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 = (struct dirent *) ((char *) dp + new_reclen);
|
|
kdp = (struct kernel_dirent *) (((char *) kdp) + kdp->d_reclen);
|
|
}
|
|
|
|
if (basep)
|
|
*basep = base;
|
|
|
|
return (char *) dp - buf;
|
|
}
|
|
|
|
#ifndef GETDENTS64
|
|
weak_alias (__getdirentries, getdirentries)
|
|
#endif
|