permit at-sign in variable names

closes: https://github.com/rsyslog/rsyslog/issues/110
This commit is contained in:
Rainer Gerhards 2014-08-19 11:26:12 +02:00
parent c65c14f031
commit 32da924748
2 changed files with 5 additions and 1 deletions

View File

@ -1,4 +1,8 @@
---------------------------------------------------------------------------
Version 8.4.1 [v8-stable] 2014-08-??
- permit at-sign in variable names
closes: https://github.com/rsyslog/rsyslog/issues/110
---------------------------------------------------------------------------
Version 8.4.0 [v8-stable] 2014-08-18
- this is the new stable branch, which incorporates all enhancements of
rsyslog 8.3.

View File

@ -133,7 +133,7 @@ int fileno(FILE *stream);
<EXPR>0[0-7]+ | /* octal number */
<EXPR>0x[0-7a-f] | /* hex number, following rule is dec; strtoll handles all! */
<EXPR>([1-9][0-9]*|0) { yylval.n = strtoll(yytext, NULL, 0); return NUMBER; }
<EXPR>\$[$!./]{0,1}[a-z][!a-z0-9\-_\.]* { yylval.s = strdup(yytext+1); return VAR; }
<EXPR>\$[$!./]{0,1}[@a-z][!@a-z0-9\-_\.]* { yylval.s = strdup(yytext+1); return VAR; }
<EXPR>\'([^'\\]|\\['"\\$bntr]|\\x[0-9a-f][0-9a-f]|\\[0-7][0-7][0-7])*\' {
yytext[yyleng-1] = '\0';
unescapeStr((uchar*)yytext+1, yyleng-2);