X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=conffile.fl;h=2cfa21b10f96202635e8d33431802d136a6ca791;hp=c1b4b042d06cf7c3dcbc430a7a1c7fde4441b2a2;hb=b1a0f651d803e1c1ff50f559b50de5c2dd6236d4;hpb=558fa3fbbb2e6fd1bed6dec54ef603ceb6c943ad

diff --git a/conffile.fl b/conffile.fl
index c1b4b04..2cfa21b 100644
--- a/conffile.fl
+++ b/conffile.fl
@@ -1,7 +1,13 @@
 /* the "incl" state is used for picking up the name of an include file */
 %x incl
 
+%option nounput
+%option noinput
+%option never-interactive
+
 %{
+#include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,17 +18,25 @@
 
 #define YY_NO_UNPUT
 
+#define YY_INPUT(buf,result,max_size)					\
+do{									\
+	(result)= fread((buf),1,(max_size),yyin);			\
+	if (ferror(yyin))						\
+		fatal_perror("Error reading configuration file (%s)",	\
+			     config_file);				\
+}while(0)
+
 #define MAX_INCLUDE_DEPTH 10
 struct include_stack_item {
 	YY_BUFFER_STATE bst;
 	uint32_t lineno;
-	string_t file;
+	cstring_t file;
 };
 struct include_stack_item include_stack[MAX_INCLUDE_DEPTH];
 int include_stack_ptr=0;
 
-uint32_t config_lineno=0;
-string_t config_file="xxx";
+int config_lineno=0;
+cstring_t config_file="xxx";
 
 static struct p_node *leafnode(uint32_t type)
 {
@@ -84,6 +98,15 @@ include			BEGIN(incl);
 	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 	BEGIN(INITIAL);
 	}
+<incl>\n		{ /* include with no filename */
+	Message(M_FATAL,"config file %s line %d: %s\n",config_file,
+		config_lineno,"``include'' requires a filename");
+	BEGIN(INITIAL);
+	assert(config_lineno < INT_MAX);
+	++config_lineno;
+	++yynerrs;
+}
+
 <<EOF>>		{
 	if (--include_stack_ptr < 0) {
 		yyterminate();