X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_parse_option.c;h=ba37f03ec4277fe0d17c51820cdfd183d4e67666;hb=be906f960ede42f72317eab6aa6a5f116857a484;hp=d94c1400919c5b4ce0ce8c2956cd91ce4c219c71;hpb=ec404735b0676bb44fdba10f3760e1ba9632405a;p=collectd.git

diff --git a/src/utils_parse_option.c b/src/utils_parse_option.c
index d94c1400..ba37f03e 100644
--- a/src/utils_parse_option.c
+++ b/src/utils_parse_option.c
@@ -1,31 +1,34 @@
 /**
  * collectd - src/utils_parse_option.c
- * Copyright (C) 2008  Florian Forster
+ * Copyright (C) 2008       Florian 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.
  *
- * Author:
- *   Florian octo Forster <octo at verplant.org>
+ * Authors:
+ *   Florian octo Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
-#include "common.h"
-#include "plugin.h"
+
 #include "utils_parse_option.h"
 
-int parse_string (char **ret_buffer, char **ret_string)
-{
+int parse_string(char **ret_buffer, char **ret_string) {
   char *buffer;
   char *string;
 
@@ -33,14 +36,13 @@ int parse_string (char **ret_buffer, char **ret_string)
 
   /* Eat up leading spaces. */
   string = buffer;
-  while (isspace ((int) *string))
+  while (isspace((int)*string))
     string++;
   if (*string == 0)
     return (1);
 
   /* A quoted string */
-  if (*string == '"')
-  {
+  if (*string == '"') {
     char *dst;
 
     string++;
@@ -49,11 +51,9 @@ int parse_string (char **ret_buffer, char **ret_string)
 
     dst = string;
     buffer = string;
-    while ((*buffer != '"') && (*buffer != 0))
-    {
+    while ((*buffer != '"') && (*buffer != 0)) {
       /* Un-escape backslashes */
-      if (*buffer == '\\')
-      {
+      if (*buffer == '\\') {
         buffer++;
         /* Catch a backslash at the end of buffer */
         if (*buffer == 0)
@@ -73,23 +73,21 @@ int parse_string (char **ret_buffer, char **ret_string)
     buffer++;
 
     /* Check for trailing spaces. */
-    if ((*buffer != 0) && !isspace ((int) *buffer))
+    if ((*buffer != 0) && !isspace((int)*buffer))
       return (-1);
-  }
-  else /* an unquoted string */
+  } else /* an unquoted string */
   {
     buffer = string;
-    while ((*buffer != 0) && !isspace ((int) *buffer))
+    while ((*buffer != 0) && !isspace((int)*buffer))
       buffer++;
-    if (*buffer != 0)
-    {
+    if (*buffer != 0) {
       *buffer = 0;
       buffer++;
     }
   }
-  
+
   /* Eat up trailing spaces */
-  while (isspace ((int) *buffer))
+  while (isspace((int)*buffer))
     buffer++;
 
   *ret_buffer = buffer;
@@ -109,8 +107,7 @@ int parse_string (char **ret_buffer, char **ret_string)
  *  However, if the value does *not* contain a space character, you can skip
  *  the quotes.
  */
-int parse_option (char **ret_buffer, char **ret_key, char **ret_value)
-{
+int parse_option(char **ret_buffer, char **ret_key, char **ret_value) {
   char *buffer;
   char *key;
   char *value;
@@ -120,24 +117,24 @@ int parse_option (char **ret_buffer, char **ret_key, char **ret_value)
 
   /* Eat up leading spaces */
   key = buffer;
-  while (isspace ((int) *key))
+  while (isspace((int)*key))
     key++;
   if (*key == 0)
     return (1);
 
   /* Look for the equal sign */
   buffer = key;
-  while (isalnum ((int) *buffer))
+  while (isalnum((int)*buffer) || *buffer == '_' || *buffer == ':')
     buffer++;
   if ((*buffer != '=') || (buffer == key))
     return (1);
   *buffer = 0;
   buffer++;
   /* Empty values must be written as "" */
-  if (isspace ((int) *buffer) || (*buffer == 0))
+  if (isspace((int)*buffer) || (*buffer == 0))
     return (-1);
 
-  status = parse_string (&buffer, &value);
+  status = parse_string(&buffer, &value);
   if (status != 0)
     return (-1);