From 9e12fa0a28d4759a0e38fedba155a4e61317c1dd Mon Sep 17 00:00:00 2001 From: Roman Tsisyk <roman@tsisyk.com> Date: Mon, 7 Oct 2013 15:35:45 +0400 Subject: [PATCH] Fix #38: "Broken require in lua" --- src/lua/init.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lua/init.cc b/src/lua/init.cc index acf1c43a93..423067d478 100644 --- a/src/lua/init.cc +++ b/src/lua/init.cc @@ -1296,9 +1296,14 @@ tarantool_lua_init() * packages, Tarantool-specific Lua libs and * instance-specific Lua scripts. */ - tarantool_lua_setpath(L, "path", cfg.script_dir, LUA_LIBPATH, + + char path[PATH_MAX]; + + snprintf(path, sizeof(path), "%s/?.lua", cfg.script_dir); + tarantool_lua_setpath(L, "path", path, LUA_LIBPATH, LUA_SYSPATH, NULL); - tarantool_lua_setpath(L, "cpath", LUA_LIBCPATH, + snprintf(path, sizeof(path), "%s/?.so", cfg.script_dir); + tarantool_lua_setpath(L, "cpath", path, LUA_LIBCPATH, LUA_SYSCPATH, NULL); /* Loadi 'ffi' extension and make it inaccessible */ -- GitLab