X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=5386739fbc372e96638ac55c79a91e8ca3af3ca9;hb=9faff71de9d74939223192766c93e1d18c2d1186;hp=18b5c43253d0d4124de0d40e30287f0bcdcda9ff;hpb=575e601fb46732bc0538ef92ea6ac3b00ef3aafd;p=collectd.git

diff --git a/src/common.c b/src/common.c
index 18b5c432..5386739f 100644
--- a/src/common.c
+++ b/src/common.c
@@ -2,18 +2,23 @@
  * collectd - src/common.c
  * Copyright (C) 2005-2014  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 collectd.org>
@@ -377,8 +382,10 @@ int strunescape (char *buf, size_t buf_len)
 		if (buf[i] != '\\')
 			continue;
 
-		if ((i >= buf_len) || (buf[i + 1] == '\0')) {
+		if (((i + 1) >= buf_len) || (buf[i + 1] == 0)) {
 			ERROR ("string unescape: backslash found at end of string.");
+			/* Ensure null-byte at the end of the buffer. */
+			buf[i] = 0;
 			return (-1);
 		}
 
@@ -397,7 +404,10 @@ int strunescape (char *buf, size_t buf_len)
 				break;
 		}
 
+		/* Move everything after the position one position to the left.
+		 * Add a null-byte as last character in the buffer. */
 		memmove (buf + i + 1, buf + i + 2, buf_len - i - 2);
+		buf[buf_len - 1] = 0;
 	}
 	return (0);
 } /* int strunescape */
@@ -1063,9 +1073,9 @@ int parse_value (const char *value_orig, value_t *ret_value, int ds_type)
   }
 
   if (value == endptr) {
-    sfree (value);
     ERROR ("parse_value: Failed to parse string as %s: %s.",
         DS_TYPE_TO_STRING (ds_type), value);
+    sfree (value);
     return -1;
   }
   else if ((NULL != endptr) && ('\0' != *endptr))
@@ -1533,6 +1543,26 @@ int strtoderive (const char *string, derive_t *ret_value) /* {{{ */
 	return (0);
 } /* }}} int strtoderive */
 
+int strtogauge (const char *string, gauge_t *ret_value) /* {{{ */
+{
+	gauge_t tmp;
+	char *endptr = NULL;
+
+	if ((string == NULL) || (ret_value == NULL))
+		return (EINVAL);
+
+	errno = 0;
+	endptr = NULL;
+	tmp = (gauge_t) strtod (string, &endptr);
+	if (errno != 0)
+		return (errno);
+	else if ((endptr == NULL) || (*endptr != 0))
+		return (EINVAL);
+
+	*ret_value = tmp;
+	return (0);
+} /* }}} int strtogauge */
+
 int strarray_add (char ***ret_array, size_t *ret_array_len, char const *str) /* {{{ */
 {
 	char **array;