projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'processes'
[collectd.git]
/
src
/
utils_mount.c
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
ed3feca
..
a02e569
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-33,7
+33,16
@@
#include "utils_debug.h"
#include "utils_mount.h"
#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
# if HAVE_SYS_PARAM_H
# include <sys/param.h>
# endif
@@
-43,15
+52,7
@@
# if HAVE_SYS_MOUNT_H
# include <sys/mount.h>
# endif
# if HAVE_SYS_MOUNT_H
# include <sys/mount.h>
# endif
-/* #endif HAVE_GETFSSTAT */
-#elif 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 */
+#endif /* HAVE_GETFSSTAT */
#if HAVE_MNTENT_H
# include <mntent.h>
#if HAVE_MNTENT_H
# include <mntent.h>
@@
-422,19
+423,19
@@
static cu_mount_t *cu_mount_listmntent (void)
/* #endif HAVE_LISTMNTENT */
/* 4.4BSD and Mac OS X (getfsstat) or NetBSD (getvfsstat) */
/* #endif HAVE_LISTMNTENT */
/* 4.4BSD and Mac OS X (getfsstat) or NetBSD (getvfsstat) */
-#elif HAVE_GET
FSSTAT || HAVE_GETV
FSSTAT
+#elif HAVE_GET
VFSSTAT || HAVE_GET
FSSTAT
static cu_mount_t *cu_mount_getfsstat (void)
{
static cu_mount_t *cu_mount_getfsstat (void)
{
-#if HAVE_GETFSSTAT
-# define STRUCT_STATFS struct statfs
-# define CMD_STATFS getfsstat
-# define FLAGS_STATFS MNT_NOWAIT
-/* #endif HAVE_GETFSSTAT */
-#elif HAVE_GETVFSSTAT
+#if HAVE_GETVFSSTAT
# define STRUCT_STATFS struct statvfs
# define CMD_STATFS getvfsstat
# define FLAGS_STATFS ST_NOWAIT
# define STRUCT_STATFS struct statvfs
# define CMD_STATFS getvfsstat
# define FLAGS_STATFS ST_NOWAIT
-#endif /* HAVE_GETVFSSTAT */
+/* #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;
int bufsize;
STRUCT_STATFS *buf;
@@
-449,7
+450,7
@@
static cu_mount_t *cu_mount_getfsstat (void)
/* Get the number of mounted file systems */
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
/* Get the number of mounted file systems */
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
- DBG (
CMD_STATFS"
failed: %s", strerror (errno));
+ DBG (
"getv?fsstat
failed: %s", strerror (errno));
return (NULL);
}
return (NULL);
}
@@
-462,7
+463,7
@@
static cu_mount_t *cu_mount_getfsstat (void)
* manpage.. -octo */
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
* manpage.. -octo */
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
- DBG (
CMD_STATFS"
failed: %s", strerror (errno));
+ DBG (
"getv?fsstat
failed: %s", strerror (errno));
free (buf);
return (NULL);
}
free (buf);
return (NULL);
}
@@
-498,10
+499,10
@@
static cu_mount_t *cu_mount_getfsstat (void)
return (first);
}
return (first);
}
-/* #endif HAVE_GETFSSTAT */
+/* #endif HAVE_GET
VFSSTAT || HAVE_GET
FSSTAT */
/* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
/* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
-#elif HAVE_
GE
N_GETMNTENT
+#elif HAVE_
TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SU
N_GETMNTENT
static cu_mount_t *cu_mount_gen_getmntent (void)
{
struct mnttab mt;
static cu_mount_t *cu_mount_gen_getmntent (void)
{
struct mnttab mt;
@@
-550,17
+551,13
@@
static cu_mount_t *cu_mount_gen_getmntent (void)
return (first);
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
return (first);
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
-/* #endif HAVE_
GE
N_GETMNTENT */
+/* #endif HAVE_
TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SU
N_GETMNTENT */
#elif HAVE_SEQ_GETMNTENT
#warn "This version of `getmntent' hat not yet been implemented!"
/* #endif HAVE_SEQ_GETMNTENT */
#elif HAVE_SEQ_GETMNTENT
#warn "This version of `getmntent' hat not yet been implemented!"
/* #endif HAVE_SEQ_GETMNTENT */
-#elif HAVE_SUN_GETMNTENT
-#warn "This version of `getmntent' hat not yet been implemented!"
-/* #endif HAVE_SUN_GETMNTENT */
-
-#elif HAVE_GETMNTENT
+#elif HAVE_ONE_GETMNTENT
static cu_mount_t *cu_mount_getmntent (void)
{
FILE *fp;
static cu_mount_t *cu_mount_getmntent (void)
{
FILE *fp;
@@
-614,7
+611,7
@@
static cu_mount_t *cu_mount_getmntent (void)
return (first);
}
return (first);
}
-#endif /* HAVE_GETMNTENT */
+#endif /* HAVE_
ONE_
GETMNTENT */
/* *** *** *** ******************************************** *** *** *** */
/* *** *** *** *** *** *** public functions *** *** *** *** *** *** */
/* *** *** *** ******************************************** *** *** *** */
/* *** *** *** *** *** *** public functions *** *** *** *** *** *** */
@@
-639,11
+636,11
@@
cu_mount_t *cu_mount_getlist(cu_mount_t **list)
#if HAVE_LISTMNTENT && 0
new = cu_mount_listmntent ();
#if HAVE_LISTMNTENT && 0
new = cu_mount_listmntent ();
-#elif HAVE_GETFSSTAT
+#elif HAVE_GET
VFSSTAT || HAVE_GET
FSSTAT
new = cu_mount_getfsstat ();
#elif HAVE_GEN_GETMNTENT
new = cu_mount_gen_getmntent ();
new = cu_mount_getfsstat ();
#elif HAVE_GEN_GETMNTENT
new = cu_mount_gen_getmntent ();
-#elif HAVE_GETMNTENT
+#elif HAVE_
ONE_
GETMNTENT
new = cu_mount_getmntent ();
#else
new = NULL;
new = cu_mount_getmntent ();
#else
new = NULL;