X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fliboconfig%2Fparser.y;h=1b2d6ccdd64990128fe997a6c9859456638252be;hb=7c9d772c992647fcba64a96800c146eb9f1647f8;hp=764212f7ee611f5ea8273628f0414c31fef41bfa;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/liboconfig/parser.y b/src/liboconfig/parser.y index 764212f7..1b2d6ccd 100644 --- a/src/liboconfig/parser.y +++ b/src/liboconfig/parser.y @@ -1,19 +1,27 @@ /** - * oconfig - src/parser.y - * Copyright (C) 2007,2008 Florian octo Forster + * collectd - src/liboconfig/parser.y + * Copyright (C) 2007,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. + * + * Authors: + * Florian Forster */ %{ @@ -23,7 +31,7 @@ #include "aux_types.h" static char *unquote (const char *orig); -static int yyerror (const char *s); +static void yyerror(const char *s); /* Lexer variables */ extern int yylineno; @@ -86,13 +94,23 @@ argument_list: argument_list argument { $$ = $1; + oconfig_value_t *tmp = realloc($$.argument, + ($$.argument_num+1) * sizeof(*$$.argument)); + if (tmp == NULL) { + yyerror("realloc failed"); + YYERROR; + } + $$.argument = tmp; + $$.argument[$$.argument_num] = $2; $$.argument_num++; - $$.argument = realloc ($$.argument, $$.argument_num * sizeof (oconfig_value_t)); - $$.argument[$$.argument_num-1] = $2; } | argument { - $$.argument = malloc (sizeof (oconfig_value_t)); + $$.argument = calloc(1, sizeof(*$$.argument)); + if ($$.argument == NULL) { + yyerror("calloc failed"); + YYERROR; + } $$.argument[0] = $1; $$.argument_num = 1; } @@ -105,7 +123,7 @@ identifier: option: identifier argument_list EOL { - memset (&$$, '\0', sizeof ($$)); + memset(&$$, 0, sizeof($$)); $$.key = $1; $$.values = $2.argument; $$.values_num = $2.argument_num; @@ -115,13 +133,13 @@ option: block_begin: OPENBRAC identifier CLOSEBRAC EOL { - memset (&$$, '\0', sizeof ($$)); + memset(&$$, 0, sizeof($$)); $$.key = $2; } | OPENBRAC identifier argument_list CLOSEBRAC EOL { - memset (&$$, '\0', sizeof ($$)); + memset(&$$, 0, sizeof($$)); $$.key = $2; $$.values = $3.argument; $$.values_num = $3.argument_num; @@ -138,11 +156,11 @@ block_end: block: block_begin statement_list block_end { - if (strcmp ($1.key, $3) != 0) + if (strcmp($1.key, $3) != 0) { - printf ("block_begin = %s; block_end = %s;\n", $1.key, $3); - yyerror ("Block not closed..\n"); - exit (1); + printf("block_begin = %s; block_end = %s;\n", $1.key, $3); + yyerror("block not closed"); + YYERROR; } free ($3); $3 = NULL; $$ = $1; @@ -151,11 +169,11 @@ block: } | block_begin block_end { - if (strcmp ($1.key, $2) != 0) + if (strcmp($1.key, $2) != 0) { - printf ("block_begin = %s; block_end = %s;\n", $1.key, $2); - yyerror ("Block not closed..\n"); - exit (1); + printf("block_begin = %s; block_end = %s;\n", $1.key, $2); + yyerror("block not closed"); + YYERROR; } free ($2); $2 = NULL; $$ = $1; @@ -176,16 +194,26 @@ statement_list: $$ = $1; if (($2.values_num > 0) || ($2.children_num > 0)) { + oconfig_item_t *tmp = realloc($$.statement, + ($$.statement_num+1) * sizeof(*tmp)); + if (tmp == NULL) { + yyerror("realloc failed"); + YYERROR; + } + $$.statement = tmp; + $$.statement[$$.statement_num] = $2; $$.statement_num++; - $$.statement = realloc ($$.statement, $$.statement_num * sizeof (oconfig_item_t)); - $$.statement[$$.statement_num-1] = $2; } } | statement { if (($1.values_num > 0) || ($1.children_num > 0)) { - $$.statement = malloc (sizeof (oconfig_item_t)); + $$.statement = calloc(1, sizeof(*$$.statement)); + if ($$.statement == NULL) { + yyerror("calloc failed"); + YYERROR; + } $$.statement[0] = $1; $$.statement_num = 1; } @@ -200,54 +228,56 @@ statement_list: entire_file: statement_list { - ci_root = malloc (sizeof (oconfig_item_t)); - memset (ci_root, '\0', sizeof (oconfig_item_t)); + ci_root = calloc(1, sizeof(*ci_root)); + if (ci_root == NULL) { + yyerror("calloc failed"); + YYERROR; + } ci_root->children = $1.statement; ci_root->children_num = $1.statement_num; } | /* epsilon */ { - ci_root = malloc (sizeof (oconfig_item_t)); - memset (ci_root, '\0', sizeof (oconfig_item_t)); - ci_root->children = NULL; - ci_root->children_num = 0; + ci_root = calloc(1, sizeof(*ci_root)); + if (ci_root == NULL) { + yyerror("calloc failed"); + YYERROR; + } } ; %% -static int yyerror (const char *s) +static void yyerror(const char *s) { - char *text; + const char *text; - if (*yytext == '\n') + if (yytext == NULL) + text = ""; + else if (*yytext == '\n') text = ""; else text = yytext; - fprintf (stderr, "Parse error in file `%s', line %i near `%s': %s\n", + fprintf(stderr, "Parse error in file `%s', line %i near `%s': %s\n", c_file, yylineno, text, s); - return (-1); } /* int yyerror */ static char *unquote (const char *orig) { char *ret = strdup (orig); - int len; - int i; - if (ret == NULL) - return (NULL); + return NULL; - len = strlen (ret); + size_t len = strlen (ret); if ((len < 2) || (ret[0] != '"') || (ret[len - 1] != '"')) - return (ret); + return ret; len -= 2; memmove (ret, ret + 1, len); - ret[len] = '\0'; + ret[len] = 0; - for (i = 0; i < len; i++) + for (size_t i = 0; i < len; i++) { if (ret[i] == '\\') { @@ -256,5 +286,5 @@ static char *unquote (const char *orig) } } - return (ret); + return ret; } /* char *unquote */