util.envload: New module to abstract Lua 5.1's setfenv and Lua 5.2's load

1 files changed, 34 insertions, 0 deletions

diff --git a/util/envload.lua b/util/envload.lua
new file mode 100644
index 00000000..53e28348
--- /dev/null
+++ b/util/envload.lua
@@ -0,0 +1,34 @@
+-- Prosody IM
+-- Copyright (C) 2008-2011 Florian Zeitz
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+local load, loadstring, loadfile, setfenv = load, loadstring, loadfile, setfenv;
+local envload;
+local envloadfile;
+
+if setfenv then
+	function envload(code, source, env)
+		local f, err = loadstring(code, source);
+		if f and env then setfenv(f, env); end
+		return f, err;
+	end
+
+	function envloadfile(file, env)
+		local f, err = loadfile(file);
+		if f and env then setfenv(f, env); end
+		return f, err;
+	end
+else
+	function envload(code, source, env)
+		return load(code, source, nil, env);
+	end
+
+	function envloadfile(file, env)
+		return loadfile(file, nil, env);
+	end
+end
+
+return { envload = envload, envloadfile = envloadfile };