diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-01 00:27:27 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-01 00:27:27 +0000 |
| commit | 76542d50f3cffb94fde4b22b293580846cff3e53 (patch) | |
| tree | 022976c47d960774d750e7a042ff7726a57652a9 /pbx/ael/ael_lex.c | |
| parent | f657c7d7599dfa7f146c3104b5355cacfe43717d (diff) | |
always trim the trailing ';'
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23806 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/ael/ael_lex.c')
| -rw-r--r-- | pbx/ael/ael_lex.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c index 5e50cb05a..132bf5435 100644 --- a/pbx/ael/ael_lex.c +++ b/pbx/ael/ael_lex.c @@ -1522,9 +1522,7 @@ YY_RULE_SETUP { STORE_LOC; yylval->str = strdup(yytext); - /* XXX maybe the truncation should be unconditional ? */ - if(yyleng > 1) - *(yylval->str+yyleng-1)=0; + yylval->str[yyleng-1] = '\0'; unput(';'); BEGIN(0); return word; @@ -1533,7 +1531,7 @@ YY_RULE_SETUP case 54: /* rule 54 can match eol */ YY_RULE_SETUP -#line 389 "ael.flex" +#line 387 "ael.flex" { FILE *in1; char fnamebuf[1024],*p1,*p2; @@ -1600,7 +1598,7 @@ case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(paren): case YY_STATE_EOF(semic): case YY_STATE_EOF(argg): -#line 451 "ael.flex" +#line 449 "ael.flex" { if ( --include_stack_index < 0 ) { yyterminate(); @@ -1616,10 +1614,10 @@ case YY_STATE_EOF(argg): YY_BREAK case 55: YY_RULE_SETUP -#line 464 "ael.flex" +#line 462 "ael.flex" ECHO; YY_BREAK -#line 1623 "ael_lex.c" +#line 1621 "ael_lex.c" case YY_END_OF_BUFFER: { @@ -2749,7 +2747,7 @@ void ael_yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 464 "ael.flex" +#line 462 "ael.flex" |