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

util.envload: Open file here instead of letting loadfile do it so that all return values from io.open can be collected

Browse source
This commit is contained in:
Kim Alvefur 2017-03-01 16:42:02 +01:00
parent 9e586ac1df
commit d6c9f0ce59
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
util/envload.lua
View file

@ -6,7 +6,8 @@
--
-- luacheck: ignore 113/setfenv
local load, loadstring, loadfile, setfenv = load, loadstring, loadfile, setfenv;
local load, loadstring, setfenv = load, loadstring, setfenv;
local io_open = io.open;
local envload;
local envloadfile;
@ -18,7 +19,9 @@ if setfenv then
end
function envloadfile(file, env)
local f, err = loadfile(file);
local fh, err, errno = io_open(file);
if not fh then return fh, err, errno; end
local f, err = load(function () return fh:read(2048); end, "@"..file);
if f and env then setfenv(f, env); end
return f, err;
end
@ -28,7 +31,9 @@ else
end
function envloadfile(file, env)
return loadfile(file, nil, env);
local fh, err, errno = io_open(file);
if not fh then return fh, err, errno; end
return load(fh:lines(2048), "@"..file, nil, env);
end
end