X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_parse_option.c;h=7f06f2959133fe46724344184d890a5d52befd9a;hb=f2daf5deea1d50dbb834cffa0c8106b5456c9d82;hp=6ed2301fea1e7e37585053f796c92e3a559b06b3;hpb=44c78181413e1e1a90d7512078fe8218b564271a;p=collectd.git diff --git a/src/utils_parse_option.c b/src/utils_parse_option.c index 6ed2301f..7f06f295 100644 --- a/src/utils_parse_option.c +++ b/src/utils_parse_option.c @@ -1,22 +1,27 @@ /** * 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 + * Authors: + * Florian octo Forster **/ #include "collectd.h" @@ -24,55 +29,31 @@ #include "plugin.h" #include "utils_parse_option.h" -/* - * parse_option - * ------------ - * Parses an ``option'' as used with the unixsock and exec commands. An - * option is of the form: - * name0="value" - * name1="value with \"quotes\"" - * name2="value \\ backslash" - * 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_string (char **ret_buffer, char **ret_string) { char *buffer; - char *key; - char *value; + char *string; buffer = *ret_buffer; - /* Eat up leading spaces */ - key = buffer; - while (isspace ((int) *key)) - key++; - if (*key == 0) - return (1); - - /* Look for the equal sign */ - value = key; - while (isalnum ((int) *value)) - value++; - if ((*value != '=') || (value == key)) + /* Eat up leading spaces. */ + string = buffer; + while (isspace ((int) *string)) + string++; + if (*string == 0) return (1); - *value = 0; - value++; - /* Empty values must be written as "" */ - if (isspace ((int) *value) || (*value == 0)) - return (-1); - /* A quoted value */ - if (*value == '"') + /* A quoted string */ + if (*string == '"') { char *dst; - value++; - if (*value == 0) - return (-1); + string++; + if (*string == 0) + return (1); - dst = value; - buffer = value; + dst = string; + buffer = string; while ((*buffer != '"') && (*buffer != 0)) { /* Un-escape backslashes */ @@ -90,6 +71,9 @@ int parse_option (char **ret_buffer, char **ret_key, char **ret_value) /* No quote sign has been found */ if (*buffer == 0) return (-1); + + *dst = 0; + dst++; *buffer = 0; buffer++; @@ -97,9 +81,9 @@ int parse_option (char **ret_buffer, char **ret_key, char **ret_value) if ((*buffer != 0) && !isspace ((int) *buffer)) return (-1); } - else /* an unquoted value */ + else /* an unquoted string */ { - buffer = value; + buffer = string; while ((*buffer != 0) && !isspace ((int) *buffer)) buffer++; if (*buffer != 0) @@ -108,12 +92,63 @@ int parse_option (char **ret_buffer, char **ret_key, char **ret_value) buffer++; } } - + /* Eat up trailing spaces */ while (isspace ((int) *buffer)) buffer++; *ret_buffer = buffer; + *ret_string = string; + + return (0); +} /* int parse_string */ + +/* + * parse_option + * ------------ + * Parses an ``option'' as used with the unixsock and exec commands. An + * option is of the form: + * name0="value" + * name1="value with \"quotes\"" + * name2="value \\ backslash" + * 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) +{ + char *buffer; + char *key; + char *value; + int status; + + buffer = *ret_buffer; + + /* Eat up leading spaces */ + key = buffer; + while (isspace ((int) *key)) + key++; + if (*key == 0) + return (1); + + /* Look for the equal sign */ + buffer = key; + 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)) + return (-1); + + status = parse_string (&buffer, &value); + if (status != 0) + return (-1); + + /* NB: parse_string will have eaten up all trailing spaces. */ + + *ret_buffer = buffer; *ret_key = key; *ret_value = value;