X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fapple_sensors.c;h=19d5a49f31731ead712a4d78409bdd87b492007e;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hp=2726ad2efdb6fc550e05163814e4c2f9c2d49557;hpb=c8ec3924c92ad3ca15229e8e923eaece64221337;p=collectd.git

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 2726ad2e..19d5a49f 100644
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -2,21 +2,26 @@
  * collectd - src/apple_sensors.c
  * Copyright (C) 2006,2007  Florian octo Forster
  *
- * 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
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
@@ -87,13 +92,13 @@ static void as_submit (const char *type, const char *type_instance,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "apple_sensors");
-	strcpy (vl.plugin_instance, "");
-	strcpy (vl.type_instance, type_instance);
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "apple_sensors", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int as_read (void)
@@ -146,10 +151,10 @@ static int as_read (void)
 		if (CFGetTypeID (property) != CFStringGetTypeID ())
 			continue;
 		if (!CFStringGetCString (property,
-					type, 128,
+					type, sizeof (type),
 					kCFStringEncodingASCII))
 			continue;
-		type[127] = '\0';
+		type[sizeof (type) - 1] = '\0';
 
 		/* Copy the sensor location. This will be used as `instance'. */
 		property = NULL;
@@ -160,10 +165,10 @@ static int as_read (void)
 		if (CFGetTypeID (property) != CFStringGetTypeID ())
 			continue;
 		if (!CFStringGetCString (property,
-					inst, 128,
+					inst, sizeof (inst),
 					kCFStringEncodingASCII))
 			continue;
-		inst[127] = '\0';
+		inst[sizeof (inst) - 1] = '\0';
 		for (i = 0; i < 128; i++)
 		{
 			if (inst[i] == '\0')
@@ -192,17 +197,17 @@ static int as_read (void)
 		if (strcmp (type, "temperature") == 0)
 		{
 			value_double = ((double) value_int) / 65536.0;
-			strcpy (type, "temperature");
+			sstrncpy (type, "temperature", sizeof (type));
 		}
 		else if (strcmp (type, "temp") == 0)
 		{
 			value_double = ((double) value_int) / 10.0;
-			strcpy (type, "temperature");
+			sstrncpy (type, "temperature", sizeof (type));
 		}
 		else if (strcmp (type, "fanspeed") == 0)
 		{
 			value_double = ((double) value_int) / 65536.0;
-			strcpy (type, "fanspeed");
+			sstrncpy (type, "fanspeed", sizeof (type));
 		}
 		else if (strcmp (type, "voltage") == 0)
 		{
@@ -212,7 +217,7 @@ static int as_read (void)
 		else if (strcmp (type, "adc") == 0)
 		{
 			value_double = ((double) value_int) / 10.0;
-			strcpy (type, "fanspeed");
+			sstrncpy (type, "fanspeed", sizeof (type));
 		}
 		else
 		{