diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-04-03 07:50:20 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-04-03 07:50:20 +0000 |
| commit | 08c9a553c723f301d044062e72871c8d9e6fa510 (patch) | |
| tree | 5fca758b8e7e4444e2a572f9e8446b48193e5f00 /sysdeps/unix/sysv/linux/statvfs64.c | |
| parent | 4eb6619c70e5db05babfa14abcf389236b73e0df (diff) | |
| download | glibc-08c9a553c723f301d044062e72871c8d9e6fa510.tar.gz glibc-08c9a553c723f301d044062e72871c8d9e6fa510.tar.xz glibc-08c9a553c723f301d044062e72871c8d9e6fa510.zip | |
Update.
2004-04-02 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/internal_statvfs64.c: New file. * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add internal_statvfs64. * sysdeps/unix/sysv/linux/internal_statvfs.c: Allow to be used to compile 64bit version. * sysdeps/unix/sysv/linux/statvfs64.c: Use __fstatfs64 and skip compatibility code if __ASSUME_STATFS64 is defined. * sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise. * sysdeps/unix/sysv/linux/statfs64.c: Don't add __no_statfs64 if __ASSUME_STATFS64 != 0. 2004-04-02 Thorsten Kukuk <kukuk@firun.suse.de> * nis/nss_nis/nis-ethers.c (saveit): Fix return codes in error case. * nis/nss_nis/nis-initgroups.c (saveit): Likewise. * nis/nss_nis/nis-proto.c (saveit): Likewise. * nis/nss_nis/nis-rpc.c (saveit): Likewise. * nis/nss_nis/nis-service.c (saveit): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/statvfs64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/statvfs64.c | 67 |
1 files changed, 46 insertions, 21 deletions
diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c index 861f60548a..79d82c756a 100644 --- a/sysdeps/unix/sysv/linux/statvfs64.c +++ b/sysdeps/unix/sysv/linux/statvfs64.c @@ -1,5 +1,5 @@ /* Return information about the filesystem on which FILE resides. - Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 2000, 2001, 2004 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 @@ -18,32 +18,57 @@ 02111-1307 USA. */ #include <errno.h> -#include <sys/statvfs.h> #include <stddef.h> #include <string.h> +#include <sys/stat.h> +#include <sys/statfs.h> +#include <sys/statvfs.h> +#include "kernel-features.h" + + +extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf, + struct statfs64 *fsbuf, struct stat64 *st); + /* Return information about the filesystem on which FILE resides. */ int __statvfs64 (const char *file, struct statvfs64 *buf) { - struct statvfs buf32; - - if (statvfs (file, &buf32) < 0) - return -1; - - buf->f_bsize = buf32.f_bsize; - buf->f_frsize = buf32.f_frsize; - buf->f_blocks = buf32.f_blocks; - buf->f_bfree = buf32.f_bfree; - buf->f_bavail = buf32.f_bavail; - buf->f_files = buf32.f_files; - buf->f_ffree = buf32.f_ffree; - buf->f_favail = buf32.f_favail; - buf->f_fsid = buf32.f_fsid; - buf->f_flag = buf32.f_flag; - buf->f_namemax = buf32.f_namemax; - memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare)); - - return 0; + struct statfs64 fsbuf; + int res = __statfs64 (file, &fsbuf); + +#ifndef __ASSUME_STATFS64 + if (res < 0 && errno == ENOSYS) + { + struct statvfs buf32; + + res = statvfs (file, &buf32); + if (res == 0) + { + buf->f_bsize = buf32.f_bsize; + buf->f_frsize = buf32.f_frsize; + buf->f_blocks = buf32.f_blocks; + buf->f_bfree = buf32.f_bfree; + buf->f_bavail = buf32.f_bavail; + buf->f_files = buf32.f_files; + buf->f_ffree = buf32.f_ffree; + buf->f_favail = buf32.f_favail; + buf->f_fsid = buf32.f_fsid; + buf->f_flag = buf32.f_flag; + buf->f_namemax = buf32.f_namemax; + memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare)); + } + } +#endif + + if (res == 0) + { + /* Convert the result. */ + struct stat64 st; + __internal_statvfs64 (file, buf, &fsbuf, + stat64 (file, &st) == -1 ? NULL : &st); + } + + return res; } weak_alias (__statvfs64, statvfs64) |