chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import release 0.1.15
[secnet.git]
/
conffile.fl
diff --git
a/conffile.fl
b/conffile.fl
index 2142ff3cdb2cf4c804022482e3e3390f146cc32d..27e725d078bb45b60e1404a97fe7e173f46d81aa 100644
(file)
--- a/
conffile.fl
+++ b/
conffile.fl
@@
-10,17
+10,27
@@
#include "conffile.tab.h"
#include "util.h"
#include "conffile.tab.h"
#include "util.h"
+#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;
#define MAX_INCLUDE_DEPTH 10
struct include_stack_item {
YY_BUFFER_STATE bst;
uint32_t lineno;
- string_t file;
+
c
string_t file;
};
struct include_stack_item include_stack[MAX_INCLUDE_DEPTH];
int include_stack_ptr=0;
uint32_t config_lineno=0;
};
struct include_stack_item include_stack[MAX_INCLUDE_DEPTH];
int include_stack_ptr=0;
uint32_t config_lineno=0;
-string_t config_file="xxx";
+
c
string_t config_file="xxx";
static struct p_node *leafnode(uint32_t type)
{
static struct p_node *leafnode(uint32_t type)
{
@@
-82,6
+92,14
@@
include BEGIN(incl);
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);
}
+<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);
+ ++config_lineno;
+ ++yynerrs;
+}
+
<<EOF>> {
if (--include_stack_ptr < 0) {
yyterminate();
<<EOF>> {
if (--include_stack_ptr < 0) {
yyterminate();