chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import release 0.09
[secnet.git]
/
conffile.fl
diff --git
a/conffile.fl
b/conffile.fl
index d191ffca017d3014f341fe4023b7c260529bfe7a..c1b4b042d06cf7c3dcbc430a7a1c7fde4441b2a2 100644
(file)
--- a/
conffile.fl
+++ b/
conffile.fl
@@
-10,8
+10,15
@@
#include "conffile.tab.h"
#include "util.h"
#include "conffile.tab.h"
#include "util.h"
+#define YY_NO_UNPUT
+
#define MAX_INCLUDE_DEPTH 10
#define MAX_INCLUDE_DEPTH 10
-YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
+struct include_stack_item {
+ YY_BUFFER_STATE bst;
+ uint32_t lineno;
+ string_t file;
+};
+struct include_stack_item include_stack[MAX_INCLUDE_DEPTH];
int include_stack_ptr=0;
uint32_t config_lineno=0;
int include_stack_ptr=0;
uint32_t config_lineno=0;
@@
-64,12
+71,16
@@
include BEGIN(incl);
if (include_stack_ptr >= MAX_INCLUDE_DEPTH) {
fatal("Configuration file includes nested too deeply");
}
if (include_stack_ptr >= MAX_INCLUDE_DEPTH) {
fatal("Configuration file includes nested too deeply");
}
- include_stack[include_stack_ptr++]=
- YY_CURRENT_BUFFER;
+ include_stack[include_stack_ptr].bst=YY_CURRENT_BUFFER;
+ include_stack[include_stack_ptr].lineno=config_lineno;
+ include_stack[include_stack_ptr].file=config_file;
+ include_stack_ptr++;
yyin=fopen(yytext,"r");
if (!yyin) {
fatal("Can't open included file %s",yytext);
}
yyin=fopen(yytext,"r");
if (!yyin) {
fatal("Can't open included file %s",yytext);
}
+ config_lineno=1;
+ config_file=safe_strdup(yytext,"conffile.fl/include");
yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
BEGIN(INITIAL);
}
yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
BEGIN(INITIAL);
}
@@
-80,7
+91,9
@@
include BEGIN(incl);
else {
fclose(yyin);
yy_delete_buffer(YY_CURRENT_BUFFER);
else {
fclose(yyin);
yy_delete_buffer(YY_CURRENT_BUFFER);
- yy_switch_to_buffer(include_stack[include_stack_ptr]);
+ yy_switch_to_buffer(include_stack[include_stack_ptr].bst);
+ config_lineno=include_stack[include_stack_ptr].lineno;
+ config_file=include_stack[include_stack_ptr].file;
}
}
\"[^\"]*\" yylval=stringnode(yytext); return TOK_STRING;
}
}
\"[^\"]*\" yylval=stringnode(yytext); return TOK_STRING;