miniOS NT 0.6.4.3 - Fixed term, Fixed exit command, Improved bootloader.

Author: skyem123

miniOS/command.lua

@@ -1,6 +1,6 @@
 -- command.lua, a very basic command interpreter for miniOS
 --are we in miniOS?
-if not miniOS then error("This program requires miniOS!") return end
+if not miniOS then error("This program requires miniOS!", 0) end
 
 local shell = {}
 
@@ -282,7 +282,7 @@ while true do
 		end
 	end
 	if shell.runline(line) == "exit" then
-		miniOS.cmdBat[#miniOS.cmdBat] = nil
+		if miniOS.cmdBat then miniOS.cmdBat[#miniOS.cmdBat] = nil end
 		return true
 	end
 end

miniOS/init.lua

@@ -1,50 +1,15 @@
-function bootcode()
-  -- Low level dofile implementation to read the rest of the OS.
-  local bootfs = {}
-  function bootfs.invoke(method, ...)
-    return component.invoke(computer.getBootAddress(), method, ...)
-  end
-  function bootfs.open(file) return bootfs.invoke("open", file) end
-  function bootfs.read(handle) return bootfs.invoke("read", handle, math.huge) end
-  function bootfs.close(handle) return bootfs.invoke("close", handle) end
-  function bootfs.inits(file) return ipairs(bootfs.invoke("list", "boot")) end
-  function bootfs.isDirectory(path) return bootfs.invoke("isDirectory", path) end
-  -- Custom low-level loadfile/dofile implementation reading from our bootfs.
-  local function loadfile(file, mode, env)
-    local handle, reason = bootfs.open(file)
-    if not handle then
-      error(reason)
-    end
-    local buffer = ""
-    repeat
-      local data, reason = bootfs.read(handle)
-      if not data and reason then
-        error(reason)
-      end
-      buffer = buffer .. (data or "")
-    until not data
-    bootfs.close(handle)
-	if mode == nil then mode = "bt" end
-    if env == nil then env = _G end
-    return load(buffer, "=" .. file)
-  end
-  _G.loadfile = loadfile
+local function loadfile(name)
+  local handle, reason = component.invoke(computer.getBootAddress(), "open", name)
+  if not handle then error(reason) end
+  local buffer = ""
+  repeat
+    local data, reason = component.invoke(computer.getBootAddress(), "read", handle, math.huge)
+    if not data and reason then error(reason) end
+    buffer = buffer .. (data or "")
+  until not data
+  component.invoke(computer.getBootAddress(), "close", handle)
+  -- Tail call!
+  return load(buffer, "=" .. name, 'bt', _G)
 end
-bootcode()
-local function dofile(file)
-  local program, reason = loadfile(file)
-  if program then
-   bootcode = nil
-   loadfile = nil
-   dofile = nil
-    local result = table.pack(pcall(program))
-    if result[1] then
-      return table.unpack(result, 2, result.n)
-    else
-      error(result[2], 3)
-    end
-  else
-    error(reason, 3)
-  end
-end
-dofile("miniOS.lua")
+-- Tail call!
+return loadfile("miniOS.lua")()

miniOS/miniOS.lua

@@ -1,5 +1,5 @@
 _G._OSNAME = "miniOS classic"
-_G._OSVER = "0.6.4"
+_G._OSVER = "0.6.4.3"
 _G._OSVERSION = _OSNAME .. " " .. _OSVER
 _G._OSCREDIT = "miniOS classic by Skye, based off of OpenOS code from OpenComputers.\nminiOS code is under BSD 2-clause licence, OpenOS code is under the MIT licence."
 
@@ -672,15 +672,15 @@ function terminal_code()
   term.gpu = function() return component.gpu end
   term.getViewport = function()
     local w, h = component.gpu.getResolution()
-    return w, h, 0, 0, 1, cursorY
+    return w, h, 0, 0, cursorX, cursorY
   end
   term.getGlobalArea = function(ignored)
     local w,h,dx,dy,rx,ry = term.getViewport(window)
     return dx+1,dy+1,w,h
   end
   term.pull = event.pull
   term.keyboard = function() return component.keyboard.address end
-  term.screen = function() return term.gpu().getScreen().address end
+  term.screen = function() return term.gpu().getScreen() end
 
   local function toggleBlink()
     if term.isAvailable() then

miniOS/version.txt

@@ -1,3 +1,3 @@
 miniOS classic
-0.6.4
+0.6.4.3
 Alpha