Module: sip-router
Branch: master
Commit: dc0bc9de9528e80cd8bc61201ce82db1a785baf4
URL:    
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc0bc9de9528e80cd8bc61201ce82db1a785baf4

Author: Daniel-Constantin Mierla <[email protected]>
Committer: Daniel-Constantin Mierla <[email protected]>
Date:   Mon Nov 19 10:45:41 2012 +0100

core: handle '\r' as end of included file name

- reported by Pirjo Ahvenainen

---

 cfg.lex |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfg.lex b/cfg.lex
index b0f4733..d864d42 100644
--- a/cfg.lex
+++ b/cfg.lex
@@ -1341,7 +1341,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);
@@ -1355,7 +1355,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);


_______________________________________________
sr-dev mailing list
[email protected]
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

Reply via email to