[sr-dev] git:3.3: core: handle '\r' as end of included file name

Module: sip-router Branch: 3.3 Commit: 5e6bc230d385f489284b4833370badb3facb492f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e6bc23… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Mon Nov 19 10:45:41 2012 +0100 core: handle '\r' as end of included file name - reported by Pirjo Ahvenainen (cherry picked from commit dc0bc9de9528e80cd8bc61201ce82db1a785baf4) --- cfg.lex | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg.lex b/cfg.lex index a626c8c..b074058 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1338,7 +1338,7 @@ IMPORTFILE "import_file" <SELECT>. { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */ <INCLF>[ \t]* /* eat the whitespace */ -<INCLF>[^ \t\n]+ { /* get the include file name */ +<INCLF>[^ \t\r\n]+ { /* get the include file name */ memset(&s_buf, 0, sizeof(s_buf)); addstr(&s_buf, yytext, yyleng); r = pp_subst_run(&s_buf.s); @@ -1352,7 +1352,7 @@ IMPORTFILE "import_file" } <IMPTF>[ \t]* /* eat the whitespace */ -<IMPTF>[^ \t\n]+ { /* get the import file name */ +<IMPTF>[^ \t\r\n]+ { /* get the import file name */ memset(&s_buf, 0, sizeof(s_buf)); addstr(&s_buf, yytext, yyleng); r = pp_subst_run(&s_buf.s);