X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fhddtemp.c;h=cb49577057f9e277c1777e9710dc351775483be9;hb=bcb24183992bccb89769b92077fcdeade83689e1;hp=09f6bbe673a1b84328b3b4e95fbc18141abeea72;hpb=c3ad119fdb1db54b7e9d4f63f6218b1392c6f66f;p=collectd.git

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 09f6bbe6..cb495770 100644
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -48,9 +48,9 @@ static const char *config_keys[] =
 {
 	"Host",
 	"Port",
-	NULL
+	"TranslateDevicename"
 };
-static int config_keys_num = 2;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 typedef struct hddname
 {
@@ -63,6 +63,7 @@ typedef struct hddname
 static hddname_t *first_hddname = NULL;
 static char *hddtemp_host = NULL;
 static char hddtemp_port[16];
+static int translate_devicename = 1;
 
 /*
  * NAME
@@ -228,6 +229,15 @@ static int hddtemp_config (const char *key, const char *value)
 			strncpy (hddtemp_port, value, sizeof (hddtemp_port));
 		hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
 	}
+	else if (strcasecmp (key, "TranslateDevicename") == 0)
+	{
+		if ((strcasecmp ("true", value) == 0)
+				|| (strcasecmp ("yes", value) == 0)
+				|| (strcasecmp ("on", value) == 0))
+			translate_devicename = 1;
+		else
+			translate_devicename = 0;
+	}
 	else
 	{
 		return (-1);
@@ -395,14 +405,14 @@ static int hddtemp_init (void)
 } /* int hddtemp_init */
 
 /*
- * hddtemp_get_name
+ * hddtemp_get_major_minor
  *
  * Description:
  *   Try to "cook" a bit the drive name as returned
  *   by the hddtemp daemon. The intend is to transform disk
  *   names into <major>-<minor> when possible.
  */
-static char *hddtemp_get_name (char *drive)
+static char *hddtemp_get_major_minor (char *drive)
 {
 	hddname_t *list;
 	char *ret;
@@ -439,8 +449,8 @@ static void hddtemp_submit (char *type_instance, double value)
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "hddtemp");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "hddtemp", sizeof (vl.plugin));
 	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
 	plugin_dispatch_values ("temperature", &vl);
@@ -477,7 +487,7 @@ static int hddtemp_read (void)
 
 	for (i = 0; i < num_disks; i++)
 	{
-		char *name, *submit_name;
+		char *name, *major_minor;
 		double temperature;
 		char *mode;
 
@@ -494,10 +504,11 @@ static int hddtemp_read (void)
 		if (mode[0] == 'F')
 			temperature = (temperature - 32.0) * 5.0 / 9.0;
 
-		if ((submit_name = hddtemp_get_name (name)) != NULL)
+		if (translate_devicename
+				&& (major_minor = hddtemp_get_major_minor (name)) != NULL)
 		{
-			hddtemp_submit (submit_name, temperature);
-			free (submit_name);
+			hddtemp_submit (major_minor, temperature);
+			free (major_minor);
 		}
 		else
 		{