/**
* collectd - src/utils_mount.c
- * Copyright (C) 2005 Niki W. Waibel
+ * Copyright (C) 2005,2006 Niki W. Waibel
*
* This program is free software; you can redistribute it and/
* or modify it under the terms of the GNU General Public Li-
* Niki W. Waibel <niki.waibel@gmx.net>
**/
-
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "common.h"
#if HAVE_XFS_XQM_H
#define XFS_SUPER_MAGIC_STR "XFSB"
#define XFS_SUPER_MAGIC2_STR "BSFX"
#endif
+
#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_MOUNT_H
# include <sys/mount.h>
# endif
-#endif /* HAVE_GETMNTINFO */
+#endif /* HAVE_GETFSSTAT */
#if HAVE_MNTENT_H
# include <mntent.h>
# include <sys/mnttab.h>
#endif
-#ifndef MNTTAB
-# if defined(_PATH_MOUNTED)
-# define MNTTAB _PATH_MOUNTED
-# elif defined(MNT_MNTTAB)
-# define MNTTAB MNT_MNTTAB
-# elif defined(MNTTABNAME)
-# define MNTTAB MNTTABNAME
-# elif defined(KMTAB)
-# define MNTTAB KMTAB
-# else
-# define MNTTAB "/etc/mnttab"
-# endif
+#if HAVE_PATHS_H
+# include <paths.h>
+#endif
+
+#ifdef COLLECTD_MNTTAB
+# undef COLLECTD_MNTTAB
+#endif
+
+#if defined(_PATH_MOUNTED) /* glibc */
+# define COLLECTD_MNTTAB _PATH_MOUNTED
+#elif defined(MNTTAB) /* Solaris */
+# define COLLECTD_MNTTAB MNTTAB
+#elif defined(MNT_MNTTAB)
+# define COLLECTD_MNTTAB MNT_MNTTAB
+#elif defined(MNTTABNAME)
+# define COLLECTD_MNTTAB MNTTABNAME
+#elif defined(KMTAB)
+# define COLLECTD_MNTTAB KMTAB
+#else
+# define COLLECTD_MNTTAB "/etc/mnttab"
#endif
/* *** *** *** ********************************************* *** *** *** */
struct mntent *mnt;
struct tabmntent *mntlist;
- if(listmntent(&mntlist, MNTTAB, NULL, NULL) < 0) {
+ if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
DBG("calling listmntent() failed: %s", strerror(errno));
}
} /* 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;
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 ("getv?fsstat failed: %s", strerror (errno));
return (NULL);
+ }
- if ((buf = (struct statfs *) malloc (bufsize * sizeof (struct statfs))) == NULL)
+ 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));
- /* FIXME: If `bufsize' in bytes or structures? */
- if ((num = getfsstat (buf, bufsize, MNT_NOWAIT)) < 1)
+ /* The bufsize needs to be passed in bytes. Really. This is not in the
+ * manpage.. -octo */
+ if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
+ DBG ("getv?fsstat failed: %s", strerror (errno));
free (buf);
return (NULL);
}
return (first);
}
-/* #endif HAVE_GETFSSTAT */
+/* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
/* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
-#elif HAVE_GEN_GETMNTENT
+#elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
static cu_mount_t *cu_mount_gen_getmntent (void)
{
struct mnttab mt;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- if ((fp = fopen (MNTTAB, "r")) == NULL)
+ DBG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+
+ if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL)
+ {
+ syslog (LOG_ERR, "fopen (%s): %s", COLLECTD_MNTTAB, strerror (errno));
return (NULL);
+ }
while (getmntent (fp, &mt) == 0)
{
return (first);
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
-/* #endif HAVE_GEN_GETMNTENT */
+/* #endif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_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;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- if ((fp = setmntent (MNTTAB, "r")) == NULL)
+ DBG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+
+ if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL)
+ {
+ syslog (LOG_ERR, "setmntent (%s): %s", COLLECTD_MNTTAB, strerror (errno));
return (NULL);
+ }
while ((me = getmntent (fp)) != NULL)
{
new->device = get_device_name (new->options);
new->next = NULL;
+ DBG ("new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}",
+ new->dir, new->spec_device, new->type, new->options, new->device);
+
/* Append to list */
if (first == NULL)
{
endmntent (fp);
+ DBG ("return (0x%p)", (void *) first);
+
return (first);
}
-#endif /* HAVE_GETMNTENT */
+#endif /* HAVE_ONE_GETMNTENT */
/* *** *** *** ******************************************** *** *** *** */
/* *** *** *** *** *** *** public functions *** *** *** *** *** *** */
#if HAVE_LISTMNTENT && 0
new = cu_mount_listmntent ();
-#elif HAVE_GETFSSTAT
+#elif HAVE_GETVFSSTAT || HAVE_GETFSSTAT
new = cu_mount_getfsstat ();
-#elif HAVE_GEN_GETMNTENT
+#elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
new = cu_mount_gen_getmntent ();
-#elif HAVE_GETMNTENT
+#elif HAVE_SEQ_GETMNTENT
+# warn "This version of `getmntent' hat not yet been implemented!"
+#elif HAVE_ONE_GETMNTENT
new = cu_mount_getmntent ();
#else
new = NULL;
cu_mount_t *this;
cu_mount_t *next;
+ DBG ("(list = 0x%p)", (void *) list);
+
for (this = list; this != NULL; this = next)
{
next = this->next;
projects / collectd.git / blobdiff