From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 25 Oct 2012 09:32:38 +0000 (+0200)
Subject: oconfig: Allow empty statement lists (in blocks and files).
X-Git-Tag: collectd-5.2.0~30^2
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=fbb3f791c3b072dc09e8ecd339f6e4808fdd8299

oconfig: Allow empty statement lists (in blocks and files).

This allows to use empty blocks (which is useful during development and
testing) and empty files (which may happen when including config directories,
cf. Debian #592881).

In order not to generate a shift/reduce error, rather than allowing a
'statement_list' to be empty, this has been implemented by explicitly allowing
empty blocks and an empty 'entire_file'.
---

diff --git a/src/liboconfig/parser.y b/src/liboconfig/parser.y
index 5b7aa94a..19f58b2b 100644
--- a/src/liboconfig/parser.y
+++ b/src/liboconfig/parser.y
@@ -148,6 +148,19 @@ block:
 	 $$.children = $2.statement;
 	 $$.children_num = $2.statement_num;
 	}
+	| block_begin block_end
+	{
+	 if (strcmp ($1.key, $2) != 0)
+	 {
+		printf ("block_begin = %s; block_end = %s;\n", $1.key, $2);
+		yyerror ("Block not closed..\n");
+		exit (1);
+	 }
+	 free ($2); $2 = NULL;
+	 $$ = $1;
+	 $$.children = NULL;
+	 $$.children_num = 0;
+	}
 	;
 
 statement:
@@ -191,6 +204,13 @@ entire_file:
 	 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;
+	}
 	;
 
 %%