summaryrefslogtreecommitdiffstats
path: root/grammar
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-14 09:00:01 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-14 09:00:01 +0200
commit172d35532c94576aad2a6e97b8bee3bc36aa3b57 (patch)
tree0a625e74f4e968b2f563a54bac199e9bceeec39a /grammar
parent3daaf7c8365e188828a45217b0234a935d1d4a77 (diff)
parent32269e3727df81896a1d349842f651ed887121f1 (diff)
downloadrsyslog-172d35532c94576aad2a6e97b8bee3bc36aa3b57.tar.gz
rsyslog-172d35532c94576aad2a6e97b8bee3bc36aa3b57.tar.xz
rsyslog-172d35532c94576aad2a6e97b8bee3bc36aa3b57.zip
Merge branch 'v6-devel'
Diffstat (limited to 'grammar')
-rw-r--r--grammar/lexer.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/grammar/lexer.l b/grammar/lexer.l
index 8b930713..869b34fe 100644
--- a/grammar/lexer.l
+++ b/grammar/lexer.l
@@ -125,12 +125,12 @@ int fileno(FILE *stream);
<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);
- yylval.estr = es_newStrFromBuf(yytext+1, strlen(yytext));
+ yylval.estr = es_newStrFromBuf(yytext+1, strlen(yytext)-1);
return STRING; }
<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);
- yylval.estr = es_newStrFromBuf(yytext+1, yyleng-2);
+ yylval.estr = es_newStrFromBuf(yytext+1, strlen(yytext)-1);
return STRING; }
<EXPR>[ \t\n]
<EXPR>[a-z][a-z0-9_]* { yylval.estr = es_newStrFromCStr(yytext, yyleng);