diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-02-27 12:44:18 +0300 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2009-02-27 12:44:18 +0300 |
| commit | 749503560ef72d7b20f935487a77ee4fbc8a9e3f (patch) | |
| tree | e5d76effbcffaa834efaaf2f0c83db3e32d31c12 /src/cfg_file.l | |
| parent | 7551c7a9483ea4821dc76bd72fe5441d99a63ed3 (diff) | |
| download | rspamd-749503560ef72d7b20f935487a77ee4fbc8a9e3f.tar.gz rspamd-749503560ef72d7b20f935487a77ee4fbc8a9e3f.zip | |
* Fix dependencies on perlxs target (do not rebuild it constantly)
* Fix rspamc to understand lmtp and delivery sections in config
* Fix parser's states when reading module options
* Add sample config for surbl module with comments
--HG--
rename : rspamc.pl => rspamc.pl.in
Diffstat (limited to 'src/cfg_file.l')
| -rw-r--r-- | src/cfg_file.l | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cfg_file.l b/src/cfg_file.l index d2810c5bb..b28bbd263 100644 --- a/src/cfg_file.l +++ b/src/cfg_file.l @@ -133,11 +133,13 @@ yes|YES|no|NO|[yY]|[nN] yylval.flag=parse_flag(yytext); return FLAG; <module>\n /* ignore EOL */; <module>[ \t]+ /* ignore whitespace */; -<module>\'[a-zA-Z0-9_-]\' yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; return MODULE_OPT; +<module>^[ \t]*#.* /* ignore comments */; +<module>\'[a-zA-Z0-9_-]+\' yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; return MODULE_OPT; <module>\{ return OBRACE; -<module>\} return EBRACE; +<module>\} BEGIN(INITIAL); return EBRACE; <module>\; return SEMICOLON; -<module>[a-zA-Z0-9_-] yylval.string=strdup(yytext); return PARAM; +<module>= return EQSIGN; +<module>[a-zA-Z0-9_-]+ yylval.string=strdup(yytext); return PARAM; <module>\$[a-zA-Z_][a-zA-Z0-9_]+ yylval.string=strdup(yytext + 1); return VARIABLE; <module>\"[^"]+\" yylval.string=strdup(yytext + 1); yylval.string[strlen(yylval.string) - 1] = '\0'; return QUOTEDSTRING; |