diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 22:44:52 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 22:44:52 +0000 |
| commit | 09a2231b580ea777c6bb72f6815491ae035faeea (patch) | |
| tree | f6c8ae435020718650f074f644f903d9b14c2825 /sysdeps/unix/sysv/linux/internal_statvfs.c | |
| parent | d1ce5f2a8cc01c63940a4ebd1dc2e97c70e139ac (diff) | |
| download | glibc-09a2231b580ea777c6bb72f6815491ae035faeea.tar.gz glibc-09a2231b580ea777c6bb72f6815491ae035faeea.tar.xz glibc-09a2231b580ea777c6bb72f6815491ae035faeea.zip | |
Update.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Change type of f_fsid field to unsigned long. Add __f_unused. Define _STATVFSBUF_F_UNUSED. * sysdeps/unix/sysv/linux/internal_statvfs.c: Adjust initialization of f_fsid field after change in struct statvfs. * sysdeps/unix/sysv/linux/alpha/bits/statvfs.h: New file. * sysdeps/unix/sysv/linux/ia64/bits/statvfs.h: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h: New file. * conform/data/sys/stat.h-data: Remove isfdtype. Use optional-macro.
Diffstat (limited to 'sysdeps/unix/sysv/linux/internal_statvfs.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/internal_statvfs.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c index ef982e9a7c..ed850a74eb 100644 --- a/sysdeps/unix/sysv/linux/internal_statvfs.c +++ b/sysdeps/unix/sysv/linux/internal_statvfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -26,7 +26,18 @@ buf->f_bavail = fsbuf.f_bavail; buf->f_files = fsbuf.f_files; buf->f_ffree = fsbuf.f_ffree; - buf->f_fsid = fsbuf.f_fsid; + if (sizeof (buf->f_fsid) == sizeof (fsbuf.f_fsid)) + buf->f_fsid = (fsbuf.f_fsid.__val[0] + | ((unsigned long int) fsbuf.f_fsid.__val[1] + << (8 * (sizeof (buf->f_fsid) + - sizeof (fsbuf.f_fsid.__val[0]))))); + else + /* We cannot help here. The statvfs element is not large enough to + contain both words of the statfs f_fsid field. */ + buf->f_fsid = fsbuf.f_fsid.__val[0]; +#ifdef _STATVFSBUF_F_UNUSED + buf->__f_unused = 0; +#endif buf->f_namemax = fsbuf.f_namelen; memset (buf->__f_spare, '\0', 6 * sizeof (int)); |