提交 94d47061 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-4077 --resolve actually it was introduced by…

FS-4077 --resolve actually it was introduced by 2b6aa7fd and should be fine now
上级 0ec0f08d
...@@ -122,7 +122,7 @@ static lua_State *lua_init(void) ...@@ -122,7 +122,7 @@ static lua_State *lua_init(void)
luaopen_freeswitch(L); luaopen_freeswitch(L);
lua_gc(L, LUA_GCRESTART, 0); lua_gc(L, LUA_GCRESTART, 0);
lua_atpanic(L, panic); lua_atpanic(L, panic);
error = luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 1, 0); error = luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 0, 0);
} }
return L; return L;
} }
...@@ -141,10 +141,10 @@ static int lua_parse_and_execute(lua_State * L, char *input_code) ...@@ -141,10 +141,10 @@ static int lua_parse_and_execute(lua_State * L, char *input_code)
if (*input_code == '~') { if (*input_code == '~') {
char *buff = input_code + 1; char *buff = input_code + 1;
error = luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 1, 0); //lua_pcall(L, 0, 0, 0); error = luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 0, 0); //lua_pcall(L, 0, 0, 0);
} else if (!strncasecmp(input_code, "#!/lua", 6)) { } else if (!strncasecmp(input_code, "#!/lua", 6)) {
char *buff = input_code + 6; char *buff = input_code + 6;
error = luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 1, 0); //lua_pcall(L, 0, 0, 0); error = luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 0, 0); //lua_pcall(L, 0, 0, 0);
} else { } else {
char *args = strchr(input_code, ' '); char *args = strchr(input_code, ' ');
if (args) { if (args) {
...@@ -168,14 +168,14 @@ static int lua_parse_and_execute(lua_State * L, char *input_code) ...@@ -168,14 +168,14 @@ static int lua_parse_and_execute(lua_State * L, char *input_code)
} }
if (code) { if (code) {
error = luaL_loadbuffer(L, code, strlen(code), "line") || docall(L, 0, 1, 0); error = luaL_loadbuffer(L, code, strlen(code), "line") || docall(L, 0, 0, 0);
switch_safe_free(code); switch_safe_free(code);
} }
} else { } else {
// Force empty argv table // Force empty argv table
char *code = NULL; char *code = NULL;
code = switch_mprintf("argv = {[0]='%s'};", input_code); code = switch_mprintf("argv = {[0]='%s'};", input_code);
error = luaL_loadbuffer(L, code, strlen(code), "line") || docall(L, 0, 1, 0); error = luaL_loadbuffer(L, code, strlen(code), "line") || docall(L, 0, 0, 0);
switch_safe_free(code); switch_safe_free(code);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论