Mercurial > clix / changeset

--- a/clix/raw.lua	Wed Aug 03 03:02:12 2022 +0200
+++ b/clix/raw.lua	Thu Mar 02 18:01:05 2023 +0100
@@ -1,4 +1,5 @@
 local verse = require "verse";
+local envload = require "util.envload".envload;
 local xml = require "util.xml";
 short_opts.i = "interactive";
 short_opts.e = "echo";
@@ -96,15 +97,12 @@
 					else
 						data = "return "..data;
 					end
-					local chunk, err = loadstring(data, "@stdin");
+					local chunk, err = envload(data, "@stdin", sandboxed and env or _G);
 					if not chunk then
 						conn:error(err);
 						return;
 					end
 					data = "";
-					if sandboxed then
-						setfenv(chunk, env);
-					end
 					local ok, ret = pcall(chunk);
 					if ok then
 						data = ret