[sr-dev] git:master: core: mpath aliased to loadpath (for K compatibility)

Module: sip-router Branch: master Commit: 8d503e9e3d3758ce0234b28c6d05e49f0e2d91e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d503e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 13:22:44 2009 +0300 core: mpath aliased to loadpath (for K compatibility) - accepts now loadpath="searchpath" (K stype) --- cfg.lex | 2 +- cfg.y | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index afae712..ab30135 100644 --- a/cfg.lex +++ b/cfg.lex @@ -407,7 +407,7 @@ SERVER_ID "server_id" CFG_DESCRIPTION "description"|"descr"|"desc" LOADMODULE loadmodule -LOADPATH loadpath +LOADPATH "loadpath"|"mpath" MODPARAM modparam /* values */ diff --git a/cfg.y b/cfg.y index d8d0e35..4729d03 100644 --- a/cfg.y +++ b/cfg.y @@ -1410,6 +1410,12 @@ module_stm: mods_dir = $2; } | LOADPATH error { yyerror("string expected"); } + | LOADPATH EQUAL STRING { + DBG("loading modules under %s\n", $3); + printf("loading modules under %s\n", $3); + mods_dir = $3; + } + | LOADPATH EQUAL error { yyerror("string expected"); } | MODPARAM LPAREN STRING COMMA STRING COMMA STRING RPAREN { if (set_mod_param_regex($3, $5, PARAM_STRING, $7) != 0) { yyerror("Can't set module parameter");