mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate direct setfenv usage

Browse source
This commit is contained in:
Florian Zeitz 2012-06-08 05:04:38 +02:00
parent 217e6d011c
commit d49b9bc2ab
11 changed files with 52 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/migration/migrator/prosody_files.lua
View file

@ -7,7 +7,6 @@ local char = string.char;
local coroutine = coroutine;
local lfs = require "lfs";
local loadfile = loadfile;
local setfenv = setfenv;
local pcall = pcall;
local mtools = require "migrator.mtools";
local next = next;

24
tools/migration/prosody-migrator.lua
View file

@ -30,16 +30,22 @@ for i = 1, #arg do
end
table.remove(arg, handled_opts);
if CFG_SOURCEDIR then
package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
else
package.path = "../../?.lua;"..package.path
package.cpath = "../../?.so;"..package.cpath
end
local envloadfile = require "util.envload".envloadfile;
-- Load config file
local function loadfilein(file, env)
if loadin then
return loadin(env, io.open(file):read("*a"));
else
local chunk, err = loadfile(file);
if chunk then
setfenv(chunk, env);
end
return chunk, err;
return envloadfile(file, env);
end
end
@ -59,14 +65,6 @@ end
config_chunk();
if CFG_SOURCEDIR then
package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
elseif not package.loaded["util.json"] then
package.path = "../../?.lua;"..package.path
package.cpath = "../../?.so;"..package.cpath
end
local have_err;
if #arg > 0 and #arg ~= 2 then
have_err = true;