projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rrdtool plugin: Make sure "cache_timeout + random_variation" dosn't get negative.
[collectd.git]
/
src
/
utils_mount.c
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
eee2eb6
..
cae3706
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-21,7
+21,9
@@
* Niki W. Waibel <niki.waibel@gmx.net>
**/
* Niki W. Waibel <niki.waibel@gmx.net>
**/
-
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "common.h"
#if HAVE_XFS_XQM_H
#include "common.h"
#if HAVE_XFS_XQM_H
@@
-258,7
+260,7
@@
uuidcache_init(void)
* (This is useful, if the cdrom on /dev/hdc must not
* be accessed.)
*/
* (This is useful, if the cdrom on /dev/hdc must not
* be accessed.)
*/
- snprintf(device, sizeof(device), "%s/%s",
+ s
s
nprintf(device, sizeof(device), "%s/%s",
DEVLABELDIR, ptname);
if(!get_label_uuid(device, &label, uuid)) {
uuidcache_addentry(sstrdup(device),
DEVLABELDIR, ptname);
if(!get_label_uuid(device, &label, uuid)) {
uuidcache_addentry(sstrdup(device),
@@
-332,7
+334,7
@@
get_spec_by_uuid(const char *s)
return get_spec_by_x(UUID, uuid);
bad_uuid:
return get_spec_by_x(UUID, uuid);
bad_uuid:
- DEBUG("Found an invalid UUID: %s", s);
+ DEBUG("
utils_mount:
Found an invalid UUID: %s", s);
return NULL;
}
return NULL;
}
@@
-351,12
+353,12
@@
static char *get_device_name(const char *optstr)
}
else if (strncmp (optstr, "UUID=", 5) == 0)
{
}
else if (strncmp (optstr, "UUID=", 5) == 0)
{
- DEBUG ("TODO: check UUID= code!");
+ DEBUG ("
utils_mount:
TODO: check UUID= code!");
rc = get_spec_by_uuid (optstr + 5);
}
else if (strncmp (optstr, "LABEL=", 6) == 0)
{
rc = get_spec_by_uuid (optstr + 5);
}
else if (strncmp (optstr, "LABEL=", 6) == 0)
{
- DEBUG ("TODO: check LABEL= code!");
+ DEBUG ("
utils_mount:
TODO: check LABEL= code!");
rc = get_spec_by_volume_label (optstr + 6);
}
else
rc = get_spec_by_volume_label (optstr + 6);
}
else
@@
-366,7
+368,7
@@
static char *get_device_name(const char *optstr)
if(!rc)
{
if(!rc)
{
- DEBUG ("Error checking device name: optstr = %s", optstr);
+ DEBUG ("
utils_mount:
Error checking device name: optstr = %s", optstr);
}
return rc;
}
}
return rc;
}
@@
-381,9
+383,11
@@
static cu_mount_t *cu_mount_listmntent (void)
struct tabmntent *mntlist;
if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
struct tabmntent *mntlist;
if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
+#if COLLECT_DEBUG
char errbuf[1024];
char errbuf[1024];
- DEBUG("calling listmntent() failed: %s",
+ DEBUG("
utils_mount:
calling listmntent() failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
}
for(p = mntlist; p; p = p->next) {
}
for(p = mntlist; p; p = p->next) {
@@
-394,7
+398,7
@@
static cu_mount_t *cu_mount_listmntent (void)
if(loop == NULL) { /* no loop= mount */
device = get_device_name(mnt->mnt_fsname);
if(device == NULL) {
if(loop == NULL) { /* no loop= mount */
device = get_device_name(mnt->mnt_fsname);
if(device == NULL) {
- DEBUG("can't get devicename for fs (%s) %s (%s)"
+ DEBUG("
utils_mount:
can't get devicename for fs (%s) %s (%s)"
": ignored", mnt->mnt_type,
mnt->mnt_dir, mnt->mnt_fsname);
continue;
": ignored", mnt->mnt_type,
mnt->mnt_dir, mnt->mnt_fsname);
continue;
@@
-452,9
+456,11
@@
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)
{
+#if COLLECT_DEBUG
char errbuf[1024];
char errbuf[1024];
- DEBUG ("getv?fsstat failed: %s",
+ DEBUG ("
utils_mount:
getv?fsstat failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
return (NULL);
}
return (NULL);
}
@@
-467,9
+473,11
@@
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)
{
+#if COLLECT_DEBUG
char errbuf[1024];
char errbuf[1024];
- DEBUG ("getv?fsstat failed: %s",
+ DEBUG ("
utils_mount:
getv?fsstat failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
free (buf);
return (NULL);
}
free (buf);
return (NULL);
}
@@
-518,7
+526,7
@@
static cu_mount_t *cu_mount_gen_getmntent (void)
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- DEBUG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+ DEBUG ("
utils_mount:
(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL)
{
if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL)
{
@@
-575,7
+583,7
@@
static cu_mount_t *cu_mount_getmntent (void)
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- DEBUG ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+ DEBUG ("
utils_mount:
(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL)
{
if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL)
{
@@
-599,7
+607,7
@@
static cu_mount_t *cu_mount_getmntent (void)
new->device = get_device_name (new->options);
new->next = NULL;
new->device = get_device_name (new->options);
new->next = NULL;
- DEBUG ("new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}",
+ DEBUG ("
utils_mount:
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 */
new->dir, new->spec_device, new->type, new->options, new->device);
/* Append to list */
@@
-617,7
+625,7
@@
static cu_mount_t *cu_mount_getmntent (void)
endmntent (fp);
endmntent (fp);
- DEBUG ("return (0x%p)", (void *) first);
+ DEBUG ("
utils_mount:
return (0x%p)", (void *) first);
return (first);
}
return (first);
}
@@
-651,11
+659,11
@@
cu_mount_t *cu_mount_getlist(cu_mount_t **list)
#elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
new = cu_mount_gen_getmntent ();
#elif HAVE_SEQ_GETMNTENT
#elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
new = cu_mount_gen_getmntent ();
#elif HAVE_SEQ_GETMNTENT
-#
warn
"This version of `getmntent' hat not yet been implemented!"
+#
error
"This version of `getmntent' hat not yet been implemented!"
#elif HAVE_ONE_GETMNTENT
new = cu_mount_getmntent ();
#else
#elif HAVE_ONE_GETMNTENT
new = cu_mount_getmntent ();
#else
- new = NULL;
+# error "Could not determine how to find mountpoints."
#endif
if (first != NULL)
#endif
if (first != NULL)
@@
-680,8
+688,6
@@
void cu_mount_freelist (cu_mount_t *list)
cu_mount_t *this;
cu_mount_t *next;
cu_mount_t *this;
cu_mount_t *next;
- DEBUG ("(list = 0x%p)", (void *) list);
-
for (this = list; this != NULL; this = next)
{
next = this->next;
for (this = list; this != NULL; this = next)
{
next = this->next;
@@
-763,8
+769,6
@@
cu_mount_getoptionvalue(char *line, char *keyword)
return r;
} /* char *cu_mount_getoptionvalue(char *line, char *keyword) */
return r;
} /* char *cu_mount_getoptionvalue(char *line, char *keyword) */
-
-
int
cu_mount_type(const char *type)
{
int
cu_mount_type(const char *type)
{
@@
-776,5
+780,3
@@
cu_mount_type(const char *type)
return CUMT_UNKNOWN;
} /* int cu_mount_type(const char *type) */
return CUMT_UNKNOWN;
} /* int cu_mount_type(const char *type) */
-
-