Merge branches 'ff/ping', 'ff/macosx-swap' and 'ff/netbsd' into collectd-3.10

diff --git a/configure.in b/configure.in
index f187cf3..679127e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -323,7 +323,7 @@ AC_CHECK_FUNCS(getifaddrs)
 
 # For mount interface
 AC_CHECK_FUNCS(getfsent getvfsent listmntent)
-AC_CHECK_FUNCS(getfsstat)
+AC_CHECK_FUNCS(getfsstat getvfsstat)
 
 # Check for different versions of `getmntent' here..
 AC_FUNC_GETMNTENT

diff --git a/src/swap.c b/src/swap.c
index f906c99..43275fc 100644 (file)
--- a/src/swap.c
+++ b/src/swap.c
@@ -250,7 +250,6 @@ static void swap_read (void)
        size_t           mib_len;
        struct xsw_usage sw_usage;
        size_t           sw_usage_len;
-       int              status;
 
        mib_len = 2;
        mib[0]  = CTL_VM;

diff --git a/src/utils_mount.c b/src/utils_mount.c
index 176714c..38ec24f 100644 (file)
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -33,7 +33,16 @@
 #include "utils_debug.h"
 #include "utils_mount.h"
 
-#if HAVE_GETFSSTAT
+#if HAVE_GETVFSSTAT
+#  if HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#  endif
+#  if HAVE_SYS_STATVFS_H
+#    include <sys/statvfs.h>
+#  endif
+/* #endif HAVE_GETVFSSTAT */
+
+#elif HAVE_GETFSSTAT
 #  if HAVE_SYS_PARAM_H
 #    include <sys/param.h>
 #  endif
@@ -43,7 +52,7 @@
 #  if HAVE_SYS_MOUNT_H
 #    include <sys/mount.h>
 #  endif
-#endif /* HAVE_GETMNTINFO */
+#endif /* HAVE_GETFSSTAT */
 
 #if HAVE_MNTENT_H
 #  include <mntent.h>
@@ -413,12 +422,23 @@ static cu_mount_t *cu_mount_listmntent (void)
 } /* cu_mount_t *cu_mount_listmntent(void) */
 /* #endif HAVE_LISTMNTENT */
 
-/* 4.4BSD and Mac OS X */
-#elif HAVE_GETFSSTAT
+/* 4.4BSD and Mac OS X (getfsstat) or NetBSD (getvfsstat) */
+#elif HAVE_GETVFSSTAT || HAVE_GETFSSTAT
 static cu_mount_t *cu_mount_getfsstat (void)
 {
+#if HAVE_GETVFSSTAT
+#  define STRUCT_STATFS struct statvfs
+#  define CMD_STATFS    getvfsstat
+#  define FLAGS_STATFS  ST_NOWAIT
+/* #endif HAVE_GETVFSSTAT */
+#elif HAVE_GETFSSTAT
+#  define STRUCT_STATFS struct statfs
+#  define CMD_STATFS    getfsstat
+#  define FLAGS_STATFS  MNT_NOWAIT
+#endif /* HAVE_GETFSSTAT */
+
        int bufsize;
-       struct statfs *buf;
+       STRUCT_STATFS *buf;
 
        int num;
        int i;
@@ -428,22 +448,22 @@ static cu_mount_t *cu_mount_getfsstat (void)
        cu_mount_t *new   = NULL;
 
        /* Get the number of mounted file systems */
-       if ((bufsize = getfsstat (NULL, 0, MNT_NOWAIT)) < 1)
+       if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
        {
-               DBG ("getfsstat failed: %s", strerror (errno));
+               DBG ("getv?fsstat failed: %s", strerror (errno));
                return (NULL);
        }
 
-       if ((buf = (struct statfs *) malloc (bufsize * sizeof (struct statfs)))
+       if ((buf = (STRUCT_STATFS *) malloc (bufsize * sizeof (STRUCT_STATFS)))
                        == NULL)
                return (NULL);
-       memset (buf, '\0', bufsize * sizeof (struct statfs));
+       memset (buf, '\0', bufsize * sizeof (STRUCT_STATFS));
 
        /* The bufsize needs to be passed in bytes. Really. This is not in the
         * manpage.. -octo */
-       if ((num = getfsstat (buf, bufsize * sizeof (struct statfs), MNT_NOWAIT)) < 1)
+       if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
        {
-               DBG ("getfsstat failed: %s", strerror (errno));
+               DBG ("getv?fsstat failed: %s", strerror (errno));
                free (buf);
                return (NULL);
        }
@@ -479,7 +499,7 @@ static cu_mount_t *cu_mount_getfsstat (void)
 
        return (first);
 }
-/* #endif HAVE_GETFSSTAT */
+/* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
 
 /* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
 #elif HAVE_GEN_GETMNTENT
@@ -620,7 +640,7 @@ cu_mount_t *cu_mount_getlist(cu_mount_t **list)
 
 #if HAVE_LISTMNTENT && 0
        new = cu_mount_listmntent ();
-#elif HAVE_GETFSSTAT
+#elif HAVE_GETVFSSTAT || HAVE_GETFSSTAT
        new = cu_mount_getfsstat ();
 #elif HAVE_GEN_GETMNTENT
        new = cu_mount_gen_getmntent ();