exec/shell.lua

@@ -1,5 +1,4 @@
 local serial = require "serialization"
-local event = require "event"
 print(pcall(function()
 local shenv = {}
 function shenv.quit()
@@ -22,15 +21,22 @@ setmetatable(shenv,{__index=function(_,k)
  if _G[k] then
   return _G[k]
  elseif fp then
+  local rqid = string.format("shell-%d",math.random(1,99999))
   return function(...)
    local tA = {...}
-   local pid = os.spawnfile(fp,fp,table.unpack(tA))
+   local pid = os.spawn(function() computer.pushSignal(rqid,pcall(loadfile(fp),table.unpack(tA))) end,fp)
-   local tE = event.pull("process_finished",pid)
+   local tE = {}
+   repeat
+    tE = {coroutine.yield()}
+    if tE[1] == rqid then
+     table.remove(tE,1)
      if tE[1] == true then
       table.remove(tE,1)
      end
      return table.unpack(tE)
     end
+   until not os.taskInfo(pid)
+  end
  end
 end})
 print(_VERSION)
@@ -45,7 +51,7 @@ while os.getenv("run") do
  if tResult[1] == true then table.remove(tResult,1) end
  for k,v in pairs(tResult) do
   if type(v) == "table" then
-   print(serial.serialize(v,true))
+   print(serial.serialize(v))
   else
    print(v)
   end

lib/serialization.lua

@@ -3,7 +3,7 @@ local local_pairs=function(tbl)
  local mt=getmetatable(tbl)
  return (mt and mt.__pairs or pairs)(tbl)
 end
-function serial.serialize(value,af) -- serialize *value* into a string. If *af* is true, allow functions. This breaks unserialization.
+function serial.serialize(value)
  local kw={["and"]=true,["break"]=true,["do"]=true,["else"]=true,["elseif"]=true,["end"]=true,["false"]=true,["for"]=true,["function"]=true,["goto"]=true,["if"]=true,["in"]=true,["local"]=true,["nil"]=true,["not"]=true,["or"]=true,["repeat"]=true,["return"]=true,["then"]=true,["true"]=true,["until"]=true,["while"]=true}
  local id="^[%a_][%w_]*$"
  local ts={}
@@ -35,12 +35,10 @@ function serial.serialize(value,af) -- serialize *value* into a string. If *af*
      r=r.."="..s(v,l+1) end end
    ts[v]=nil
    return (r or "{").."}"
-  elseif t=="function" and af then
-   return tostring(v)
   else error("ut "..t) end end
  return s(value, 1)
 end
-function serial.unserialize(data) -- return *data*, but unserialized
+function serial.unserialize(data)
  checkArg(1, data, "string")
  local result, reason = load("return " .. data, "=data", _, {math={huge=math.huge}})
  if not result then return nil, reason end

module/init.lua

@@ -1,3 +1,4 @@
+--#include "module/chatbox-dprint.lua"
 --#include "module/syslog.lua"
 --#include "module/sched.lua"
 --#include "module/osutil.lua"

module/loadfile.lua

@@ -7,9 +7,8 @@ end
 function runfile(p,...) -- runs file *p* with arbitrary arguments in the current thread
  return loadfile(p)(...)
 end
-function os.spawnfile(p,n,...) -- spawns a new process from file *p* with name *n*, with arguments following *n*.
+function os.spawnfile(p,n) -- spawns a new process from file *p* with name *n*
- local tA = {...}
+ return os.spawn(function() xpcall(loadfile(p),function(e) dprint(e.."\n"..debug.traceback()) end) end,n or p)
- return os.spawn(function() computer.pushSignal("process_finished", os.pid(), pcall(loadfile(p), table.unpack(tA))) end,n or p)
 end
 function require(f) -- searches for a library with name *f* and returns what the library returns, if possible
  local lib = os.getenv("LIB") or "/boot/lib"

module/sched.lua

@@ -19,17 +19,17 @@ end
 function os.kill(pid) -- removes process *pid* from the task list
  tTasks[pid] = nil
 end
-function os.pid() -- returns the current process' PID
+function os.pid()
  return cPid
 end
-function os.tasks() -- returns a table of process IDs
+function os.tasks()
  local rt = {}
  for k,v in pairs(tTasks) do
   rt[#rt+1] = k
  end
  return rt
 end
-function os.taskInfo(pid) -- returns info on process *pid* as a table with name and parent values
+function os.taskInfo(pid)
  pid = pid or os.pid()
  if not tTasks[pid] then return false end
  return {name=tTasks[pid].n,parent=tTasks[pid].P}