summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulio M. Merino Vidal <jmmv@NetBSD.org>2006-04-09 10:08:22 +0000
committerBenoît Dejean <bdejean@src.gnome.org>2006-04-09 10:08:22 +0000
commitcead508eae62bc5a39452a45d3f09b3b21c310d5 (patch)
treee083e8a7fa2cdc9cc93e6010ae737551b4708cc3
parent26d85d02fbb100f238aca6b06f9a5c834e06a75d (diff)
downloadlibgtop-cead508eae62bc5a39452a45d3f09b3b21c310d5.tar.gz
Use statvfs(2) if available instead of statfs(2). The latter was replaced
2006-04-04 Julio M. Merino Vidal <jmmv@NetBSD.org> * sysdeps/freebsd/fsusage.c: Use statvfs(2) if available instead of statfs(2). The latter was replaced by the former and is no longer available under, e.g. NetBSD. Fixes bug #337235.
-rw-r--r--sysdeps/freebsd/ChangeLog9
-rw-r--r--sysdeps/freebsd/fsusage.c12
2 files changed, 21 insertions, 0 deletions
diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog
index 5bcd3241..326d57fe 100644
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-04 Julio M. Merino Vidal <jmmv@NetBSD.org>
+
+ * sysdeps/freebsd/fsusage.c:
+
+ Use statvfs(2) if available instead of statfs(2). The latter was
+ replaced by the former and is no longer available under, e.g. NetBSD.
+
+ Fixes bug #337235.
+
2006-04-04 Benoît Dejean <benoit@placenet.org>
* sysinfo.c: (init_sysinfo):
diff --git a/sysdeps/freebsd/fsusage.c b/sysdeps/freebsd/fsusage.c
index f0bd423d..c4b5b039 100644
--- a/sysdeps/freebsd/fsusage.c
+++ b/sysdeps/freebsd/fsusage.c
@@ -9,7 +9,11 @@
#include <unistd.h>
#include <sys/param.h>
+#if defined (HAVE_SYS_STATVFS_H)
+#include <sys/statvfs.h>
+#else
#include <sys/mount.h>
+#endif
#include <stdio.h>
#include <string.h>
@@ -27,9 +31,17 @@ _glibtop_freebsd_get_fsusage_read_write(glibtop *server,
const char *path)
{
int result;
+#if defined (STAT_STATVFS)
+ struct statvfs sfs;
+#else
struct statfs sfs;
+#endif
+#if defined (STAT_STATVFS)
result = statfs (path, &sfs);
+#else
+ result = statfs (path, &sfs);
+#endif
if (result == -1) {
return;