mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
[BZ #2226]
2006-02-12 Ulrich Drepper <drepper@redhat.com> * io/ftw.c: Start using *at functions. * io/ftw64.c: Likewise. * sysdeps/generic/not-cancel.h: Define openat_not_cancel, openat_not_cancel_3, openat64_not_cancel, and openat64_not_cancel_3. * sysdeps/unix/sysv/linux/not-cancel.h: Likewise. * sysdeps/unix/sysv/linux/openat.c: Create separate _nocancel functions. * io/fxstatat.c: Add __fxstatat alias. * sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c: Likewise. * sysdeps/unix/sysv/linux/fxstatat.c: Likewise. Add support for newfstatat syscall. * sysdeps/unix/sysv/linux/i386/fxstatat.c: Add __fxstatat alias. Add support for fstatat64 syscall. * include/sys/stat.h: Declare __fxstatat. * io/fxstatat64.c: Add __fxstatat64 alias. * sysdeps/unix/sysv/linux/fxstatat64.c: Add support for fstatat64 syscall. * dirent/fdopendir.c: Add __fdopendir alias. * sysdeps/unix/fdopendir.c: Likewise. * sysdeps/mach/hurd/fdopendir.c: Likewise. * include/dirent.h: Add __fdopendir declaration. [BZ #2226] * libio/wgenops.c (_IO_wsetb): Use correct size of wide char buffer in FREE_BUF call.
This commit is contained in:
@ -37,6 +37,42 @@
|
||||
int
|
||||
__fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
|
||||
{
|
||||
int result;
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
#ifdef STAT_IS_KERNEL_STAT
|
||||
# define kst (*st)
|
||||
#else
|
||||
struct kernel_stat kst;
|
||||
#endif
|
||||
|
||||
#ifdef __NR_newfstatat
|
||||
# ifndef __ASSUME_ATFCTS
|
||||
if (__have_atfcts >= 0)
|
||||
# endif
|
||||
{
|
||||
result = INTERNAL_SYSCALL (newfstatat, err, 4, fd, file, &kst, flag);
|
||||
# ifndef __ASSUME_ATFCTS
|
||||
if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 1)
|
||||
&& INTERNAL_SYSCALL_ERRNO (result, err) == ENOSYS)
|
||||
__have_atfcts = -1;
|
||||
else
|
||||
# endif
|
||||
if (!__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 1))
|
||||
{
|
||||
#ifdef STAT_IS_KERNEL_STAT
|
||||
return 0;
|
||||
#else
|
||||
return __xstat_conv (vers, &kst, st);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
__set_errno (INTERNAL_SYSCALL_ERRNO (result, err));
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (flag & ~AT_SYMLINK_NOFOLLOW)
|
||||
{
|
||||
__set_errno (EINVAL);
|
||||
@ -63,9 +99,6 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
|
||||
file = buf;
|
||||
}
|
||||
|
||||
int result;
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
|
||||
if (vers == _STAT_VER_KERNEL)
|
||||
{
|
||||
if (flag & AT_SYMLINK_NOFOLLOW)
|
||||
@ -85,8 +118,6 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
struct kernel_stat kst;
|
||||
|
||||
if (flag & AT_SYMLINK_NOFOLLOW)
|
||||
result = INTERNAL_SYSCALL (lstat, err, 2, CHECK_STRING (file),
|
||||
__ptrvalue (&kst));
|
||||
@ -102,8 +133,9 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
|
||||
|
||||
return -1;
|
||||
}
|
||||
libc_hidden_def (__fxstatat)
|
||||
#ifdef XSTAT_IS_XSTAT64
|
||||
# undef __fxstatat64
|
||||
strong_alias (__fxstatat, __fxstatat64);
|
||||
libc_hidden_ver (__fxstatat, __fxstatat64)
|
||||
libc_hidden_def (__fxstatat64)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user