X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=462e1c6778fe3aa2f1066de9e3172b548fada012;hb=106e2016957fe53e4d249f1352bb5a7ec9caa76b;hp=a9c1bdb7b815cc7322290939534a1f0a6a13e091;hpb=3ada23491952cc01baadd19ffeba27e0c332f0c1;p=collectd.git

diff --git a/src/df.c b/src/df.c
index a9c1bdb7..462e1c67 100644
--- a/src/df.c
+++ b/src/df.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/df.c
  * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2009       Paul Sadauskas
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Paul Sadauskas <psadauskas at gmail.com>
  **/
 
 #include "collectd.h"
@@ -48,16 +50,15 @@ static const char *config_keys[] =
 	"MountPoint",
 	"FSType",
 	"IgnoreSelected",
-        "ReportByDevice",
-	NULL
+        "ReportByDevice"
 };
-static int config_keys_num = 5;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 static ignorelist_t *il_device = NULL;
 static ignorelist_t *il_mountpoint = NULL;
 static ignorelist_t *il_fstype = NULL;
 
-static bool by_device = false;
+static _Bool by_device = false;
 
 static int df_init (void)
 {
@@ -95,9 +96,7 @@ static int df_config (const char *key, const char *value)
 	}
 	else if (strcasecmp (key, "IgnoreSelected") == 0)
 	{
-		if ((strcasecmp (value, "True") == 0)
-				|| (strcasecmp (value, "Yes") == 0)
-				|| (strcasecmp (value, "On") == 0))
+		if (IS_TRUE (value))
 		{
 			ignorelist_set_invert (il_device, 0);
 			ignorelist_set_invert (il_mountpoint, 0);
@@ -111,14 +110,11 @@ static int df_config (const char *key, const char *value)
 		}
 		return (0);
 	}
-        else if (strcasecmp (key, "ReportByDevice") == 0)
-        {
-		if ((strcasecmp (value, "True") == 0)
-				|| (strcasecmp (value, "Yes") == 0)
-				|| (strcasecmp (value, "On") == 0))
-		{
-                        by_device = true;
-		}
+	else if (strcasecmp (key, "ReportByDevice") == 0)
+	{
+		if (IS_TRUE (value))
+			by_device = true;
+
 		return (0);
 	}
 
@@ -140,7 +136,7 @@ static void df_submit (char *df_name,
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "df", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
-	sstrncpy (vl.type, "df", sizeof (vl.host));
+	sstrncpy (vl.type, "df", sizeof (vl.type));
 	sstrncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
 
 	plugin_dispatch_values (&vl);
@@ -168,6 +164,16 @@ static int df_read (void)
 
 	for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
 	{
+		if (ignorelist_match (il_device,
+					(mnt_ptr->spec_device != NULL)
+					? mnt_ptr->spec_device
+					: mnt_ptr->device))
+			continue;
+		if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
+			continue;
+		if (ignorelist_match (il_fstype, mnt_ptr->type))
+			continue;
+
 		if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
 		{
 			char errbuf[1024];
@@ -186,8 +192,12 @@ static int df_read (void)
 
 		if (by_device) 
 		{
-			// eg, /dev/hda1  -- strip off the "/dev/"
-			strncpy (disk_name, mnt_ptr->spec_device + 5, sizeof (disk_name));
+			/* eg, /dev/hda1  -- strip off the "/dev/" */
+			if (strncmp (mnt_ptr->spec_device, "/dev/", strlen ("/dev/")) == 0)
+				sstrncpy (disk_name, mnt_ptr->spec_device + strlen ("/dev/"), sizeof (disk_name));
+			else
+				sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
+
 			if (strlen(disk_name) < 1) 
 			{
 				DEBUG("df: no device name name for mountpoint %s, skipping", mnt_ptr->dir);
@@ -213,16 +223,6 @@ static int df_read (void)
 			}
 		}
 
-		if (ignorelist_match (il_device,
-					(mnt_ptr->spec_device != NULL)
-					? mnt_ptr->spec_device
-					: mnt_ptr->device))
-			continue;
-		if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
-			continue;
-		if (ignorelist_match (il_fstype, mnt_ptr->type))
-			continue;
-
 		df_submit (disk_name, df_used, df_free);
 	}