(svn r2101) statvfs() is availible on POSIX.1 conformant systems.

Also use a different field, which has a better chance of containing meaningful information, of the returned struct to determine the free space on the filesystem and fix a small bug introduced in r2100 (s/!=/==/)

1 files changed, 8 insertions, 4 deletions

diff --git a/unix.c b/unix.c
index 93fbcc79d..ff9e096c2 100644
--- a/unix.c
+++ b/unix.c
@@ -12,7 +12,11 @@
 #include <pwd.h>
 #include <signal.h>
 
-#if defined(__linux__)
+#if (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) || defined(__linux__)
+	#define HAS_STATVFS
+#endif
+
+#ifdef HAS_STATVFS
 #include <sys/statvfs.h>
 #endif
 
@@ -312,12 +316,12 @@ StringID FiosGetDescText(const char **path, uint32 *tot)
 	uint32 free = 0;
 	*path = _fios_path[0] != '\0' ? _fios_path : "/";
 
-#if defined(__linux__)
+#ifdef HAS_STATVFS
 	{
 		struct statvfs s;
 
-		if (statvfs(*path, &s) != 0) {
-			free = ((uint64)s.f_bsize * s.f_bavail) >> 20;
+		if (statvfs(*path, &s) == 0) {
+			free = (uint64)s.f_frsize * s.f_bavail >> 20;
 		} else
 			return STR_4006_UNABLE_TO_READ_DRIVE;
 	}