kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-4077 --resolve actually it was introduced by 2b6aa7fd04 and should be fine now

This commit is contained in:
Anthony Minessale 2012-04-10 12:37:41 -05:00
parent 0ec0f08dc2
commit 94d47061c3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/languages/mod_lua/mod_lua.cpp
View File

@ -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)
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)
} }
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);
} }