diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2013-01-17 22:44:00 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2013-01-17 22:44:00 +0100 |
| commit | bcf1bfabdef4481d4748e6c4a82b579af628fd75 (patch) | |
| tree | 8da8ac1bd99cc996fb3ab725405a7bb06bdca776 /libc/misc | |
| parent | 1e2e4ac6193ffe0900bd392fa3c596883771eb34 (diff) | |
statfs: support f_frsize
closes bugzilla #5834
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/misc')
| -rw-r--r-- | libc/misc/statfs/fstatfs64.c | 3 | ||||
| -rw-r--r-- | libc/misc/statfs/internal_statvfs.c | 8 | ||||
| -rw-r--r-- | libc/misc/statfs/statfs64.c | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/libc/misc/statfs/fstatfs64.c b/libc/misc/statfs/fstatfs64.c index bc12020a0..ecdfabed1 100644 --- a/libc/misc/statfs/fstatfs64.c +++ b/libc/misc/statfs/fstatfs64.c @@ -42,6 +42,9 @@ int fstatfs64 (int fd, struct statfs64 *buf) buf->f_files = buf32.f_files; buf->f_ffree = buf32.f_ffree; buf->f_fsid = buf32.f_fsid; +#ifdef _STATFS_F_FRSIZE + buf->f_frsize = buf32.f_frsize; +#endif buf->f_namelen = buf32.f_namelen; memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare)); diff --git a/libc/misc/statfs/internal_statvfs.c b/libc/misc/statfs/internal_statvfs.c index 6eb4afe5a..29890d490 100644 --- a/libc/misc/statfs/internal_statvfs.c +++ b/libc/misc/statfs/internal_statvfs.c @@ -18,8 +18,12 @@ /* Now fill in the fields we have information for. */ buf->f_bsize = fsbuf.f_bsize; - /* Linux does not support f_frsize, so set it to the full block size. */ +#ifdef _STATFS_F_FRSIZE + buf->f_frsize = fsbuf.f_frsize; +#else + /* No support for f_frsize so set it to the full block size. */ buf->f_frsize = fsbuf.f_bsize; +#endif buf->f_blocks = fsbuf.f_blocks; buf->f_bfree = fsbuf.f_bfree; buf->f_bavail = fsbuf.f_bavail; @@ -38,7 +42,7 @@ buf->__f_unused = 0; #endif buf->f_namemax = fsbuf.f_namelen; - memset (buf->__f_spare, '\0', 6 * sizeof (int)); + memset (buf->__f_spare, '\0', sizeof(fsbuf.f_spare)); /* What remains to do is to fill the fields f_favail and f_flag. */ diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c index c11b7db23..99227977d 100644 --- a/libc/misc/statfs/statfs64.c +++ b/libc/misc/statfs/statfs64.c @@ -41,6 +41,9 @@ int statfs64 (const char *file, struct statfs64 *buf) buf->f_ffree = buf32.f_ffree; buf->f_fsid = buf32.f_fsid; buf->f_namelen = buf32.f_namelen; +#ifdef _STATFS_F_FRSIZE + buf->f_frsize = buf32.f_frsize; +#endif memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare)); return 0; |