X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_parse_option.c;h=3652a666c2a73ef99a9c5563d712937cf88ffec0;hb=2ede5e7fd0f7e75edd1fba531cd870bb16092e71;hp=56e65ea54f127e456c660b5774e7e229fdd42726;hpb=061c3c091d725d58dfe1e7525a8d72a1ea389a8a;p=collectd.git diff --git a/src/utils_parse_option.c b/src/utils_parse_option.c index 56e65ea5..3652a666 100644 --- a/src/utils_parse_option.c +++ b/src/utils_parse_option.c @@ -25,8 +25,7 @@ **/ #include "collectd.h" -#include "common.h" -#include "plugin.h" + #include "utils_parse_option.h" int parse_string (char **ret_buffer, char **ret_string) @@ -92,7 +91,7 @@ int parse_string (char **ret_buffer, char **ret_string) buffer++; } } - + /* Eat up trailing spaces */ while (isspace ((int) *buffer)) buffer++; @@ -155,55 +154,4 @@ int parse_option (char **ret_buffer, char **ret_key, char **ret_value) return (0); } /* int parse_option */ -int escape_string (char *buffer, size_t buffer_size) -{ - char *temp; - size_t i; - size_t j; - - /* Check if we need to escape at all first */ - temp = strpbrk (buffer, " \t\"\\"); - if (temp == NULL) - return (0); - - temp = (char *) malloc (buffer_size); - if (temp == NULL) - return (-1); - memset (temp, 0, buffer_size); - - temp[0] = '"'; - j = 1; - - for (i = 0; i < buffer_size; i++) - { - if (buffer[i] == 0) - { - break; - } - else if ((buffer[i] == '"') || (buffer[i] == '\\')) - { - if (j > (buffer_size - 4)) - break; - temp[j] = '\\'; - temp[j + 1] = buffer[i]; - j += 2; - } - else - { - if (j > (buffer_size - 3)) - break; - temp[j] = buffer[i]; - j++; - } - } - - assert ((j + 1) < buffer_size); - temp[j] = '"'; - temp[j + 1] = 0; - - sstrncpy (buffer, temp, buffer_size); - sfree (temp); - return (0); -} /* int escape_string */ - /* vim: set sw=2 ts=8 tw=78 et : */