From 01360f64401925047fb5d2ae7b70c64e8f4a9fb5 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Mon, 1 May 2006 00:27:27 +0000 Subject: always trim the trailing ';' git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23806 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx/ael/ael.flex | 4 +--- pbx/ael/ael_lex.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'pbx') diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex index 9f5e2f67f..04da2b324 100644 --- a/pbx/ael/ael.flex +++ b/pbx/ael/ael.flex @@ -378,9 +378,7 @@ includes { STORE_POS; return KW_INCLUDES;} {NOSEMIC}; { 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; 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" -- cgit v1.2.3