X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=7c2c30eccf38b1bcc498264727679b6be3270031;hb=8dc963f846c51d8ba173587a136231c2b3646afc;hp=b654719b6b94194644f328c6a0a318006222240e;hpb=6d86a97190a193863aadc252f20f6b9dba61c263;p=collectd.git

diff --git a/src/common.c b/src/common.c
index b654719b..7c2c30ec 100644
--- a/src/common.c
+++ b/src/common.c
@@ -253,7 +253,7 @@ int strsplit (char *string, char **fields, size_t size)
 			break;
 	}
 
-	return (i);
+	return ((int) i);
 }
 
 int strjoin (char *dst, size_t dst_len,
@@ -317,6 +317,40 @@ int strsubstitute (char *str, char c_from, char c_to)
 	return (ret);
 } /* int strsubstitute */
 
+int strunescape (char *buf, size_t buf_len)
+{
+	size_t i;
+
+	for (i = 0; (i < buf_len) && (buf[i] != '\0'); ++i)
+	{
+		if (buf[i] != '\\')
+			continue;
+
+		if ((i >= buf_len) || (buf[i + 1] == '\0')) {
+			ERROR ("string unescape: backslash found at end of string.");
+			return (-1);
+		}
+
+		switch (buf[i + 1]) {
+			case 't':
+				buf[i] = '\t';
+				break;
+			case 'n':
+				buf[i] = '\n';
+				break;
+			case 'r':
+				buf[i] = '\r';
+				break;
+			default:
+				buf[i] = buf[i + 1];
+				break;
+		}
+
+		memmove (buf + i + 1, buf + i + 2, buf_len - i - 2);
+	}
+	return (0);
+} /* int strunescape */
+
 int escape_slashes (char *buf, int buf_len)
 {
 	int i;
@@ -349,6 +383,19 @@ int escape_slashes (char *buf, int buf_len)
 	return (0);
 } /* int escape_slashes */
 
+void replace_special (char *buffer, size_t buffer_size)
+{
+	size_t i;
+
+	for (i = 0; i < buffer_size; i++)
+	{
+		if (buffer[i] == 0)
+			return;
+		if ((!isalnum ((int) buffer[i])) && (buffer[i] != '-'))
+			buffer[i] = '_';
+	}
+} /* void replace_special */
+
 int timeval_cmp (struct timeval tv0, struct timeval tv1, struct timeval *delta)
 {
 	struct timeval *larger;
@@ -531,26 +578,26 @@ int check_create_dir (const char *file_orig)
 int get_kstat (kstat_t **ksp_ptr, char *module, int instance, char *name)
 {
 	char ident[128];
+
+	*ksp_ptr = NULL;
 	
 	if (kc == NULL)
 		return (-1);
 
 	ssnprintf (ident, sizeof (ident), "%s,%i,%s", module, instance, name);
 
+	*ksp_ptr = kstat_lookup (kc, module, instance, name);
 	if (*ksp_ptr == NULL)
 	{
-		if ((*ksp_ptr = kstat_lookup (kc, module, instance, name)) == NULL)
-		{
-			ERROR ("Cound not find kstat %s", ident);
-			return (-1);
-		}
+		ERROR ("get_kstat: Cound not find kstat %s", ident);
+		return (-1);
+	}
 
-		if ((*ksp_ptr)->ks_type != KSTAT_TYPE_NAMED)
-		{
-			WARNING ("kstat %s has wrong type", ident);
-			*ksp_ptr = NULL;
-			return (-1);
-		}
+	if ((*ksp_ptr)->ks_type != KSTAT_TYPE_NAMED)
+	{
+		ERROR ("get_kstat: kstat %s has wrong type", ident);
+		*ksp_ptr = NULL;
+		return (-1);
 	}
 
 #ifdef assert
@@ -560,13 +607,13 @@ int get_kstat (kstat_t **ksp_ptr, char *module, int instance, char *name)
 
 	if (kstat_read (kc, *ksp_ptr, NULL) == -1)
 	{
-		WARNING ("kstat %s could not be read", ident);
+		ERROR ("get_kstat: kstat %s could not be read", ident);
 		return (-1);
 	}
 
 	if ((*ksp_ptr)->ks_type != KSTAT_TYPE_NAMED)
 	{
-		WARNING ("kstat %s has wrong type", ident);
+		ERROR ("get_kstat: kstat %s has wrong type", ident);
 		return (-1);
 	}
 
@@ -790,6 +837,43 @@ int parse_identifier (char *str, char **ret_host,
 	return (0);
 } /* int parse_identifier */
 
+int parse_value (const char *value, value_t *ret_value, int ds_type)
+{
+  char *endptr = NULL;
+
+  switch (ds_type)
+  {
+    case DS_TYPE_COUNTER:
+      ret_value->counter = (counter_t) strtoull (value, &endptr, 0);
+      break;
+
+    case DS_TYPE_GAUGE:
+      ret_value->gauge = (gauge_t) strtod (value, &endptr);
+      break;
+
+    case DS_TYPE_DERIVE:
+      ret_value->counter = (derive_t) strtoll (value, &endptr, 0);
+      break;
+
+    case DS_TYPE_ABSOLUTE:
+      ret_value->counter = (absolute_t) strtoull (value, &endptr, 0);
+      break;
+
+    default:
+      ERROR ("parse_value: Invalid data source type: %i.", ds_type);
+      return -1;
+  }
+
+  if (value == endptr) {
+    ERROR ("parse_value: Failed to parse string as number: %s.", value);
+    return -1;
+  }
+  else if ((NULL != endptr) && ('\0' != *endptr))
+    WARNING ("parse_value: Ignoring trailing garbage after number: %s.",
+        endptr);
+  return 0;
+} /* int parse_value */
+
 int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
 {
 	int i;
@@ -805,7 +889,11 @@ int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
 		dummy = NULL;
 
 		if (i >= vl->values_len)
+		{
+			/* Make sure i is invalid. */
+			i = vl->values_len + 1;
 			break;
+		}
 
 		if (i == -1)
 		{
@@ -816,12 +904,10 @@ int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
 		}
 		else
 		{
-			if (strcmp ("U", ptr) == 0)
+			if ((strcmp ("U", ptr) == 0) && (ds->ds[i].type == DS_TYPE_GAUGE))
 				vl->values[i].gauge = NAN;
-			else if (ds->ds[i].type == DS_TYPE_COUNTER)
-				vl->values[i].counter = atoll (ptr);
-			else if (ds->ds[i].type == DS_TYPE_GAUGE)
-				vl->values[i].gauge = atof (ptr);
+			else if (0 != parse_value (ptr, &vl->values[i], ds->ds[i].type))
+				return -1;
 		}
 
 		i++;