X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fstat%2Fstatvfs.c;h=30d587971b0a0946ae4293dc43cb54d231d763fd;hb=9448b0513e2eec020fbca9c10412b83df5027a16;hp=11ad7543d9ce6a8d757fb4418f18073534c406a2;hpb=114c80f1416617399c85c2df09dd307532399903;p=musl

diff --git a/src/stat/statvfs.c b/src/stat/statvfs.c
index 11ad7543..30d58797 100644
--- a/src/stat/statvfs.c
+++ b/src/stat/statvfs.c
@@ -5,6 +5,7 @@
 
 int __statfs(const char *path, struct statfs *buf)
 {
+	*buf = (struct statfs){0};
 #ifdef SYS_statfs64
 	return syscall(SYS_statfs64, path, sizeof *buf, buf);
 #else
@@ -14,6 +15,7 @@ int __statfs(const char *path, struct statfs *buf)
 
 int __fstatfs(int fd, struct statfs *buf)
 {
+	*buf = (struct statfs){0};
 #ifdef SYS_fstatfs64
 	return syscall(SYS_fstatfs64, fd, sizeof *buf, buf);
 #else
@@ -26,20 +28,21 @@ weak_alias(__fstatfs, fstatfs);
 
 static void fixup(struct statvfs *out, const struct statfs *in)
 {
+	*out = (struct statvfs){0};
 	out->f_bsize = in->f_bsize;
-	out->f_frsize = in->f_bsize;
+	out->f_frsize = in->f_frsize ? in->f_frsize : in->f_bsize;
 	out->f_blocks = in->f_blocks;
 	out->f_bfree = in->f_bfree;
 	out->f_bavail = in->f_bavail;
 	out->f_files = in->f_files;
 	out->f_ffree = in->f_ffree;
-	out->f_favail = 0;
-	out->f_fsid = in->f_fsid.val[0];
+	out->f_favail = in->f_ffree;
+	out->f_fsid = in->f_fsid.__val[0];
 	out->f_flag = in->f_flags;
 	out->f_namemax = in->f_namelen;
 }
 
-int statvfs(const char *path, struct statvfs *buf)
+int statvfs(const char *restrict path, struct statvfs *restrict buf)
 {
 	struct statfs kbuf;
 	if (__statfs(path, &kbuf)<0) return -1;