diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-01-19 03:54:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-01-19 03:54:00 +0000 |
| commit | e3a7ff87496c82371904601ad568e7de86db4fce (patch) | |
| tree | 4bc03016462a9fd55e31e426387c0ebcac4095a4 /sysdeps/unix/sysv/linux/i386/xstat.c | |
| parent | 63e04088bfe942ec4430985fea2ee024f1c38988 (diff) | |
| download | glibc-e3a7ff87496c82371904601ad568e7de86db4fce.tar.gz | |
Update.
2000-01-18 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/i386/lxstat.c: New file, handles 32bit UIDs.
* sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise.
* sysdeps/unix/sysv/linux/i386/xstat.c (__xstat): Move
_STAT_VER_KERNEL handling up; don't save errno.
* sysdeps/unix/sysv/linux/arm/fxstat.c: New file.
* sysdeps/unix/sysv/linux/arm/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/arm/xstat.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/fxstat.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/xstat.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c: Likewise.
Reported by Bruno Haible.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/xstat.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/xstat.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c index 2e6eb3ee0a..c879960a58 100644 --- a/sysdeps/unix/sysv/linux/i386/xstat.c +++ b/sysdeps/unix/sysv/linux/i386/xstat.c @@ -46,39 +46,34 @@ extern int __have_no_stat64; int __xstat (int vers, const char *name, struct stat *buf) { -#if __ASSUME_STAT64_SYSCALL > 0 struct kernel_stat kbuf; int result; + if (vers == _STAT_VER_KERNEL) + { + return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf); + } +#if __ASSUME_STAT64_SYSCALL > 0 result = INLINE_SYSCALL (stat64, 2, name, &buf64); if (result == 0) result = xstat32_conv (vers, &buf64, buf); return result; #else - struct kernel_stat kbuf; - int result; - - if (vers == _STAT_VER_KERNEL) - { - return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf); - } # if defined __NR_stat64 /* To support 32 bit UIDs, we have to use stat64. The normal stat call only returns 16 bit UIDs. */ if (! __have_no_stat64) { struct stat64 buf64; - - int saved_errno = errno; + result = INLINE_SYSCALL (stat64, 2, name, &buf64); if (result == 0) result = xstat32_conv (vers, &buf64, buf); - + if (result != -1 || errno != ENOSYS) return result; - __set_errno (saved_errno); __have_no_stat64 = 1; } # endif |