Merge pull request '1.2-dev' (#9) from 1.2-dev into main

Reviewed-on: Hyperion/HyperionOS#9

.vscode/settings.json

@@ -5,6 +5,7 @@
         "syscall",
         "printf",
         "printInline",
-        "toHex"
+        "toHex",
+        "loadcstr"
     ]
 }

README.md

@@ -1,3 +1,4 @@
+[![Download on PineStore](https://raster.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpinestore.cc%2Fapi%2Fproject%2F225&query=%24.project.downloads&suffix=%20downloads&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iNzYuOTA0IiBoZWlnaHQ9Ijg5LjI5NSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ieE1pZFlNaWQiIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDc2OS4wNCA4OTIuOTUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI%2BCiA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQuNzQgLTQuNjgyNikiIGZpbGw9IiM5YWIyZjIiPgogIDxwYXRoIGQ9Im00MTAgODUxYzAtMTIgMjYtMjEgNTgtMjEgMTUgMCAyMiA0IDE3IDktMTQgMTItNzUgMjItNzUgMTJ6Ii8%2BCiAgPHBhdGggZD0ibTU4NSA3NDJjLTEtNDkgNC03MiAxNi04NSAyMi0yNCAzMC02OCAxNi04Ni0xMi0xNC0yNy0zOS00OC03OC0xMC0xOS05LTI2IDQtNDEgMjItMjQgMjEtNjctMi0xNDQtMjEtNjktMzktMTQ0LTQ4LTE5NS00LTI2LTItMzMgMTEtMzMgMzEgMCAxMTIgMzMgMTQxIDU4IDI4IDIzIDgxIDkyIDcxIDkyLTIgMCA1IDI2IDE2IDU3IDI4IDc5IDI5IDIyNCAzIDMwOC0xMCAzMy0xOSA2Mi0xOSA2NS00IDI2LTEzMiAxNTAtMTU1IDE1MC0zIDAtNi0zMC02LTY4eiIvPgogIDxwYXRoIGQ9Im02OCA2NzNjLTcyLTEwOS03MS0yNzggMy00MjMgMzYtNzEgNjItMTAwIDEyOC0xNDAgNDMtMjcgNjUtMzQgMTE4LTM2IDEwMC00IDk4IDExLTE5IDEzNi0zNCAzNy03OCA4OC05NiAxMTMtMjggMzktMzEgNDgtMjEgNjUgMTEgMTcgNiAyNy0zMyA3OS00MCA1My00NCA2Mi0zMiA3OCAxNyAyMyAxOCA1NyAyIDczLTYgNi0xNCAzMS0xNyA1NC02IDQyLTYgNDItMzMgMXoiLz4KIDwvZz4KIDxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNC43NCAtNC42ODI2KSIgZmlsbD0iIzU5YTY0ZiI%2BCiAgPHBhdGggZD0ibTM2NSA4MTNjLTUzLTYtMTM5LTMzLTE5Mi02MS02OC0zNS04My02Ny01OC0xMjIgMjYtNTkgNDAtNjcgNzgtNDkgNjggMzMgMTY3IDU4IDI2NiA2OSA1OCA1IDEwNiAxMiAxMDkgMTQgMiAzIDYgMzIgOSA2NSA4IDg1IDAgOTEtMTAxIDkwLTQ0LTEtOTQtNC0xMTEtNnoiLz4KICA8cGF0aCBkPSJtNDEwIDQ1OWMtNjctNy0xNjAtMjktMTk5LTQ4LTI3LTE0LTM0LTM2LTIwLTYzIDIxLTM4IDk3LTEzNiAxNTAtMTkzIDI1LTI3IDU4LTcxIDczLTk3IDI1LTQzIDMxLTQ3IDU0LTQyIDQwIDEwIDQyIDEyIDQyIDUyIDAgMjAgNiA1NyAxNCA4MiAyNCA3MyA1NCAxOTIgNjIgMjM2IDUgMzUgMyA0NS0xNSA2My0yMyAyMy0zNiAyNC0xNjEgMTB6Ii8%2BCiA8L2c%2BCiA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQuNzQgLTQuNjgyNikiIGZpbGw9IiM3ZWNiMjUiPgogIDxwYXRoIGQ9Im01NTggNjc0Yy0yLTItNTEtOS0xMDktMTQtMTAyLTExLTIwNC0zNy0yNjQtNjktMTYtOC0zMi0xNC0zNC0xMi00IDMtMzEtNDgtMzEtNjEgMC01IDIxLTMxIDQ2LTU4IDUxLTU0IDcxLTYwIDEzMC0zNSAxOSA4IDgzIDE5IDE0MiAyNSA1OCA2IDEwNyAxMiAxMDcgMTNzMTUgMjYgMzMgNTZjMjcgNDMgMzIgNjMgMzAgOTktMiAzNS04IDQ3LTI1IDUzLTExIDQtMjMgNi0yNSAzeiIvPgogPC9nPgogPGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE0Ljc0IC00LjY4MjYpIiBmaWxsPSIjZWNlZGVmIj4KICA8cGF0aCBkPSJtMjYwIDg5MGMtMzQtOC03MC00MS03MC02NSAwLTYtOS0yMC0yMC0zMHMtMjAtMjItMjAtMjctMTMtMjEtMzAtMzVjLTM1LTI5LTQxLTgzLTEzLTEyMiAxNS0yMiAxNS0yNi0xLTU2LTE4LTMzLTE4LTMzIDI3LTkxIDI4LTM2IDQyLTYzIDM2LTY4LTIzLTI1IDktNzggMTIwLTE5NyAzNi0zOCA3Mi04MSA4Mi05NiAxMC0xNCAyNS0zMCAzMy0zNSAzNi0yMCA3IDMyLTUzIDk3LTQ4IDUxLTEyNiAxNTAtMTQ5IDE4OS0xMCAxOC05IDI0IDEwIDQwIDIzIDE5IDIzIDE5LTI5IDcxLTUzIDUyLTUzIDUyLTM4IDgyIDE0IDI4IDE0IDMzLTEwIDc2LTMyIDU3LTIzIDgxIDQ2IDEyMCAzNCAxOSA0OSAzMyA0NSA0Mi0xNCAzNyAzNiA3NSA5OCA3NSAyNSAwIDQwLTcgNTQtMjUgMTgtMjMgMjctMjUgOTUtMjUgOTQgMCAxMDItOCA5My04OS02LTUzLTUtNTkgMTQtNjQgMzItOCAyNi02NC0xNS0xMzItMzUtNTgtMzUtNTgtOS04MiAyMS0xOSAyNC0yOSAxOS01Ni0xMC00Ny00NC0xNzUtNjEtMjI3LTgtMjUtMTQtNjItMTQtODMgMC0yNy01LTM5LTE3LTQzLTEwLTMtMjUtOC0zMy0xMC0xMi00LTEyLTYtMS0xNCAyNy0xNiA1NiA1IDY5IDUxIDM1IDExNyA0MyAxNDggNDYgMTcwIDIgMTMgMTEgNTEgMjEgODQgMjEgNzEgMjEgMTIxIDAgMTQ1LTE0IDE1LTEzIDE5IDUgNDMgMTEgMTQgMjAgMzAgMjAgMzVzNyAxNSAxNSAyMmMyMSAxNyAxNiA3NS0xMCAxMDItMTggMTktMjAgMzItMTcgNzkgNCA1MCAyIDU4LTE5IDcyLTEyIDktNTAgMTktODMgMjMtNDUgNS02NSAxMy04MyAzMi0yNiAyOC05MiAzOC0xNTMgMjJ6Ii8%2BCiA8L2c%2BCiA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQuNzQgLTQuNjgyNikiIGZpbGw9IiM3ZTY3NGQiPgogIDxwYXRoIGQ9Im0yNDggODU0Yy0zMC0xNi00Ny01OS0zMC03NiA4LTggMjMtNyA1NCAyIDI0IDcgNjEgMTQgODMgMTcgNTQgNyA1OSAxNSAzNSA0Ni0xOCAyMy0yOSAyNy02OCAyNy0yNi0xLTU5LTctNzQtMTZ6Ii8%2BCiA8L2c%2BCjwvc3ZnPgo%3D&label=PineStore)](https://pinestore.cc/projects/225/hyperionos)
 # HyperionOS
 
 HyperionOS is a modular, hybrid kernel operating system written entirely in Lua. It features a custom task scheduler, virtual filesystem, syscall interface, and separates core functionality from user-space services.

Src/Hyperion-bash/bin/cat

@@ -1,24 +0,0 @@
-local args = {...}
-local name = syscall.getTask(syscall.getpid()).name
-local fs = require("sys.fs")
-local filePath = (args[1] or "")
-if filePath:sub(1, 1) ~= "/" then
-    filePath = syscall.getcwd().."/"..filePath
-end
-
-if not fs.exists(filePath) and args[1] then
-    print(name..": Cannot access '"..args[1].."': No such file.")
-    return
-end
-
-local file = 0
-if args[1] then
-    file = syscall.open(filePath, "r")
-end
-local content=""
-while content~=nil or file == 0 do
-    content=syscall.read(file, 1024)
-    printInline(content)
-end
-syscall.close(file)
-print("")

Src/Hyperion-bash/bin/clear

@@ -1 +0,0 @@
-syscall.devctl(1,"clear")

Src/Hyperion-bash/bin/echo

@@ -1,2 +0,0 @@
-local args = {...}
-print(table.concat(args, " "))

Src/Hyperion-bash/bin/help

@@ -1,292 +0,0 @@
---:Minify:--
--- help: display command reference with paged scrolling
-
-local COMMANDS = {
-    -- {name, usage, description, {flags...}}
-    -- flags: {flag, desc}
-    {
-        name = "cat",
-        usage = "cat [file]",
-        desc = "Print file contents to stdout. Reads from stdin if no file given.",
-        flags = {}
-    },
-    {
-        name = "cd",
-        usage = "cd [dir]",
-        desc = "Change working directory. Use '-' to return to previous directory.",
-        flags = {}
-    },
-    {
-        name = "clear",
-        usage = "clear",
-        desc = "Clear the terminal screen.",
-        flags = {}
-    },
-    {
-        name = "echo",
-        usage = "echo [text...]",
-        desc = "Print arguments to stdout.",
-        flags = {}
-    },
-    {
-        name = "hfetch",
-        usage = "hfetch",
-        desc = "Display system information in a neofetch-style layout.",
-        flags = {}
-    },
-    {
-        name = "id",
-        usage = "id [username]",
-        desc = "Print user identity (uid, gid). Defaults to current user.",
-        flags = {}
-    },
-    {
-        name = "login",
-        usage = "login",
-        desc = "System login prompt. Launched automatically at boot.",
-        flags = {}
-    },
-    {
-        name = "ls",
-        usage = "ls [-alh] [dir]",
-        desc = "List directory contents.",
-        flags = {
-            {"-a", "Show hidden files (starting with .)"},
-            {"-l", "Long format: permissions, owner, size"},
-            {"-h", "Human-readable file sizes"},
-        }
-    },
-    {
-        name = "lsusers",
-        usage = "lsusers",
-        desc = "List all user accounts with uid, gid, home, and shell.",
-        flags = {}
-    },
-    {
-        name = "lua",
-        usage = "lua",
-        desc = "Interactive Lua REPL prompt.",
-        flags = {}
-    },
-    {
-        name = "mkdir",
-        usage = "mkdir <dir>",
-        desc = "Create a directory.",
-        flags = {}
-    },
-    {
-        name = "passwd",
-        usage = "passwd [username]",
-        desc = "Change a user password. Non-root must verify current password first.",
-        flags = {}
-    },
-    {
-        name = "ps",
-        usage = "ps",
-        desc = "List running tasks with pid, user, name, and status.",
-        flags = {}
-    },
-    {
-        name = "pwd",
-        usage = "pwd",
-        desc = "Print current working directory.",
-        flags = {}
-    },
-    {
-        name = "su",
-        usage = "su [username]",
-        desc = "Switch user. Defaults to root. Root can switch without a password.",
-        flags = {}
-    },
-    {
-        name = "sudo",
-        usage = "sudo [-u user] <command> [args...]",
-        desc = "Run a command as another user (default root). Authenticates as current user.",
-        flags = {
-            {"-u user", "Run as the specified user (name or uid)"},
-        }
-    },
-    {
-        name = "sysdump",
-        usage = "sysdump",
-        desc = "List all registered kernel syscalls.",
-        flags = {}
-    },
-    {
-        name = "useradd",
-        usage = "useradd [-p pw] [-g gid] [-d home] [-s shell] [-M] <username>",
-        desc = "Create a new user account.",
-        flags = {
-            {"-p pw",    "Set password (prompted interactively if omitted)"},
-            {"-g gid",   "Set primary group id"},
-            {"-d home",  "Set home directory (default: /home/username)"},
-            {"-s shell", "Set login shell (default: /bin/hysh)"},
-            {"-M",       "Do not create home directory"},
-        }
-    },
-    {
-        name = "userdel",
-        usage = "userdel [-r] <username>",
-        desc = "Delete a user account.",
-        flags = {
-            {"-r", "Also recursively remove the user's home directory"},
-        }
-    },
-    {
-        name = "usermod",
-        usage = "usermod [-l name] [-p pw] [-g gid] [-d home] [-s shell] [-L] [-U] <username>",
-        desc = "Modify an existing user account.",
-        flags = {
-            {"-l name",  "Rename the user"},
-            {"-p pw",    "Set new password"},
-            {"-g gid",   "Change primary group id"},
-            {"-d home",  "Change home directory"},
-            {"-s shell", "Change login shell"},
-            {"-L",       "Lock the account (disable login)"},
-            {"-U",       "Unlock the account"},
-        }
-    },
-    {
-        name = "whoami",
-        usage = "whoami",
-        desc = "Print the current username.",
-        flags = {}
-    },
-    {
-        name = "yes",
-        usage = "yes [text]",
-        desc = "Repeatedly print 'y' (or given text) until interrupted with Ctrl+C.",
-        flags = {}
-    },
-}
-
--- Build lines to display
-local C_HEAD  = 7   -- yellow  (section headers)
-local C_CMD   = 5   -- cyan    (command name)
-local C_USAGE = 1   -- white   (usage line)
-local C_DESC  = 13  -- grey    (description)
-local C_FLAG  = 3   -- green   (flag name)
-local C_DIM   = 12  -- dark grey
-
--- Each entry is {text, color}
-local lines = {}
-local function push(text, col) lines[#lines+1] = {text, col or 1} end
-
-push("HyperionOS Command Reference", C_HEAD)
-push(string.rep("=", 50), C_DIM)
-push("", 1)
-
-local args = {...}
-local filter = args[1]  -- optional: help <command>
-
-local function addCmd(cmd)
-    push(cmd.name, C_CMD)
-    push("  Usage: " .. cmd.usage, C_USAGE)
-    push("  " .. cmd.desc, C_DESC)
-    if #cmd.flags > 0 then
-        for _, f in ipairs(cmd.flags) do
-            push("    " .. f[1], C_FLAG)
-            push("        " .. f[2], C_DESC)
-        end
-    end
-    push("", 1)
-end
-
-if filter then
-    local found = false
-    for _, cmd in ipairs(COMMANDS) do
-        if cmd.name == filter then addCmd(cmd); found = true; break end
-    end
-    if not found then
-        push("help: unknown command '" .. filter .. "'", 2)
-        push("Run 'help' with no arguments for the full list.", C_DESC)
-    end
-else
-    push("Run 'help <command>' for details on a specific command.", C_DESC)
-    push("", 1)
-    for _, cmd in ipairs(COMMANDS) do addCmd(cmd) end
-end
-
--- Pager
-local sizeStr = syscall.devctl(1, "size")
-local screenW = tonumber(sizeStr:sub(1, sizeStr:find(";")-1)) or 51
-local screenH = tonumber(sizeStr:sub(sizeStr:find(";")+1)) or 19
-local pageSize = screenH - 2  -- reserve bottom row for status bar
-
-local scroll = 0
-local totalLines = #lines
-local dirty = true
-
-local function render()
-    syscall.devctl(1, "clear")
-    syscall.devctl(1, "spos", 1, 1)
-    for row = 1, pageSize do
-        local li = scroll + row
-        if li <= totalLines then
-            local text, col = lines[li][1], lines[li][2]
-            syscall.devctl(1, "sfgc", col)
-            -- truncate to screen width
-            if #text > screenW then text = text:sub(1, screenW) end
-            syscall.write(1, text .. "\n")
-        else
-            syscall.write(1, "\n")
-        end
-    end
-    -- status bar
-    syscall.devctl(1, "sfgc", 16)
-    syscall.devctl(1, "sbgc", 13)
-    local pct = math.floor(math.min(100, (scroll + pageSize) / totalLines * 100))
-    local status = string.format(" help -- line %d/%d (%d%%)  [up/down: scroll  q: quit] ",
-        scroll + 1, totalLines, pct)
-    if #status > screenW then status = status:sub(1, screenW) end
-    syscall.devctl(1, "spos", 1, screenH)
-    syscall.write(1, status .. string.rep(" ", screenW - #status))
-    syscall.devctl(1, "sfgc", 1)
-    syscall.devctl(1, "sbgc", 16)
-    dirty = false
-end
-
--- If output fits on one screen, just print without pager
-if totalLines <= pageSize then
-    syscall.devctl(1, "clear")
-    syscall.devctl(1, "spos", 1, 1)
-    for _, line in ipairs(lines) do
-        syscall.devctl(1, "sfgc", line[2])
-        syscall.write(1, line[1] .. "\n")
-    end
-    syscall.devctl(1, "sfgc", 1)
-    return
-end
-
-render()
-while true do
-    local ch = syscall.read(0)
-    if not ch or ch == "" then
-        -- idle
-    elseif ch == "q" or ch == "Q" then
-        break
-    elseif ch == "\17" then  -- up arrow
-        if scroll > 0 then
-            scroll = scroll - 1
-            dirty = true
-        end
-    elseif ch == "\18" then  -- down arrow
-        if scroll + pageSize < totalLines then
-            scroll = scroll + 1
-            dirty = true
-        end
-    elseif ch == "\19" then  -- left / page up (reuse left arrow)
-        scroll = math.max(0, scroll - pageSize)
-        dirty = true
-    elseif ch == "\20" then  -- right / page down
-        scroll = math.min(totalLines - pageSize, scroll + pageSize)
-        dirty = true
-    end
-    if dirty then render() end
-end
-
--- Restore screen
-syscall.devctl(1, "clear")
-syscall.devctl(1, "spos", 1, 1)
-syscall.devctl(1, "sfgc", 1)
-syscall.devctl(1, "sbgc", 16)

Src/Hyperion-bash/bin/hysh

@@ -1,299 +0,0 @@
---:Minify:--
-syscall.open("/dev/tty/TTY1","r") --stdin  (Device 0)
-syscall.open("/dev/tty/TTY1","w") --stdout (Device 1)
-syscall.open("/dev/null","w")     --stderr (device 2)
-
-local success, errorMsg = xpcall(function()
-
-
-
-local fs = require("sys.fs")
-
-syscall.devctl(1,"clear")
-syscall.devctl(1,"sfgc",1)
-syscall.devctl(1,"spos",1,1)
-print("HyperionOS hysh Shell")
-
-local userhost = (syscall.getUsername() or "Unknown").."@"..(syscall.getHostname() or "Unknown")
-local commandHistory = {}
-local terminate = false
-syscall.setEnviron("SHELL","rtbash")
-syscall.setEnviron("PATH","/bin/")
-syscall.chdir("/")
-local oldWD = ""
-
-for i = 1, 16 do
-    syscall.devctl(1,"sbgc",i)
-    printInline("   ");
-end
-print("\n")
-
-syscall.sigcatch(function(sig)
-    if sig == 1 then
-        terminate = true
-    end
-end)
-
-local builtinCmds = {}
-
-builtinCmds.cd = function(path)
-    local cwd = syscall.getcwd()
-    local dirIn = (path or "")
-    if dirIn == "-" then
-        if oldWD == "" then
-            print("hysh-cd: No previous working directory set.")
-        else
-            print(oldWD)
-            syscall.chdir(oldWD)
-            oldWD = cwd
-        end
-        return
-    end
-    local dirInMod = dirIn
-    if dirIn:sub(1, 1) ~= "/" then dirInMod = cwd .. "/" .. dirIn end
-    local parts = {}
-    for part in dirInMod:gmatch("[^/]+") do
-        if part == ".." then
-            if #parts > 0 then table.remove(parts) end
-        elseif part ~= "." and part ~= "" then
-            table.insert(parts, part)
-        end
-    end
-    local normDir =  "/" .. table.concat(parts, "/")
-    if normDir:sub(#normDir, #normDir) ~= "/" then normDir = normDir .. "/" end 
-
-    if not fs.isDir(normDir) then
-        print("hysh-cd: "..dirIn..": No such directory.")
-        return
-    end
-    oldWD = cwd
-    syscall.chdir(normDir)
-end
-
-
-local function getUserInput()
-    syscall.devctl(1,"sfgc",3)
-    syscall.write(1, userhost)
-    syscall.devctl(1,"sfgc",1)
-    syscall.write(1, ":")
-    syscall.devctl(1,"sfgc",10)
-    syscall.write(1, syscall.getcwd())
-    syscall.devctl(1,"sfgc",1)
-    syscall.write(1, "$ ")
-    local curOffsetStr = syscall.devctl(1, "gpos")
-    local curOffsetX = tonumber(curOffsetStr:sub(1, curOffsetStr:find(";")-1))
-    local curOffsetY = tonumber(curOffsetStr:sub(curOffsetStr:find(";")+1))
-
-    local input = ""
-    local blinkState = false
-    local cursorPos = 1
-    local history = 0
-    local dirty = true  -- redraw on first iteration
-
-    local function redraw()
-        syscall.devctl(1,"spos",curOffsetX,curOffsetY)
-        -- text before cursor
-        syscall.write(1, string.sub(input, 1, cursorPos-1))
-        -- cursor character (inverted if blinking on)
-        if blinkState then
-            syscall.devctl(1,"sfgc",16)
-            syscall.devctl(1,"sbgc",1)
-        end
-        if cursorPos > #input then
-            syscall.write(1, " ")
-        else
-            syscall.write(1, string.sub(input, cursorPos, cursorPos))
-        end
-        syscall.devctl(1,"sfgc",1)
-        syscall.devctl(1,"sbgc",16)
-        -- text after cursor + trailing space to erase old chars
-        syscall.write(1, string.sub(input, cursorPos+1) .. " ")
-    end
-
-    while true do
-        local key = syscall.read(0)
-        if key and key ~= "" then
-            if key == "\19" then -- left arrow
-                if cursorPos > 1 then
-                    cursorPos = cursorPos - 1
-                    dirty = true
-                end
-            elseif key == "\20" then -- right arrow
-                if cursorPos <= #input then
-                    cursorPos = cursorPos + 1
-                    dirty = true
-                end
-            elseif key == "\17" then -- up arrow
-                if history < #commandHistory then
-                    history = history + 1
-                    input = commandHistory[#commandHistory - history + 1]
-                    cursorPos = #input + 1
-                    dirty = true
-                end
-            elseif key == "\18" then -- down arrow
-                if history > 1 then
-                    history = history - 1
-                    input = commandHistory[#commandHistory - history + 1]
-                    cursorPos = #input + 1
-                    dirty = true
-                elseif history == 1 then
-                    history = 0
-                    input = ""
-                    cursorPos = 1
-                    dirty = true
-                end
-            elseif key == "\b" then
-                if cursorPos > 1 then
-                    input = string.sub(input, 1, cursorPos-2) .. string.sub(input, cursorPos)
-                    cursorPos = cursorPos - 1
-                    dirty = true
-                end
-            elseif key == "\n" then
-                -- redraw cleanly with no cursor highlight before committing
-                syscall.devctl(1,"sfgc",1)
-                syscall.devctl(1,"sbgc",16)
-                syscall.devctl(1,"spos",curOffsetX,curOffsetY)
-                syscall.write(1, input .. " \n")
-                return input
-            else
-                input = string.sub(input, 1, cursorPos-1) .. key .. string.sub(input, cursorPos)
-                cursorPos = cursorPos + 1
-                dirty = true
-            end
-        end
-
-        -- cursor blink
-        local curBlink = ((math.floor(syscall.getUptime() / 500) % 2) == 0)
-        if curBlink ~= blinkState then
-            blinkState = curBlink
-            dirty = true
-        end
-
-        if dirty then
-            redraw()
-            dirty = false
-        end
-    end
-end
-
-local function runCommand(command)
-    do
-        local func = load("return " .. command, "@equation", "t", {})
-        if func then
-            local success, result = pcall(func)
-            if success and type(result) == "number" then
-                print(result)
-                return
-            end
-        end
-    end
-
-    terminate = false
-    local args = string.split(command, " ")
-    if builtinCmds[args[1]] then
-        local success, msg = pcall(builtinCmds[args[1]], table.unpack(args, 2))
-        if not success then
-            local errSL = string.sub(msg, string.find(msg, "]") + 2)
-            syscall.devctl(1,"sfgc",2)
-            printInline(args[1]..": Program runtime error on line ")
-            print(string.sub(errSL, 1, string.find(errSL, ":") - 1))
-            syscall.devctl(1,"sfgc",1)
-            print(string.sub(errSL, string.find(errSL, ":") + 1))
-        end
-        return
-    end
-
-    local cmdPath = ""
-    if string.find(args[1], "/") then
-        if fs.exists(args[1]) then
-            cmdPath = args[1]
-        end
-    else
-        local paths = string.split(syscall.getEnviron("PATH"), ":")
-        for _, path in pairs(paths) do
-            if fs.exists(path..args[1]) then
-                cmdPath = path..args[1]
-                break
-            end
-        end
-    end
-
-    if cmdPath == "" then
-        print(args[1]..": Command not found")
-        return
-    end
-
-    local progName = string.sub(cmdPath, #cmdPath - string.find(string.reverse(cmdPath), "/") + 2)
-    
-    local text = fs.readAllText(cmdPath)
-    local program, err = load(text, progName)
-    if not program then
-        local errSL = string.sub(err, string.find(err, ":") + 1)
-        syscall.devctl(1,"sfgc",2)
-        printInline(progName..": Program load error on line ")
-        print(string.sub(errSL, 1, string.find(errSL, ":") - 1))
-        syscall.devctl(1,"sfgc",1)
-        print(string.sub(errSL, string.find(errSL, ":") + 1))
-        return
-    end
-
-    local proc = syscall.spawn(function(...)
-        syscall.open("/dev/tty/TTY1","r")
-        syscall.open("/dev/tty/TTY1","w")
-        syscall.open("/dev/null","w")
-        local success, msg = pcall(program, ...)
-        if not success then
-            local errSL = string.sub(msg, string.find(msg, ":") + 1)
-            syscall.devctl(1,"sfgc",2)
-            printInline(progName..": Program runtime error on line ")
-            print(string.sub(errSL, 1, string.find(errSL, ":") - 1))
-            syscall.devctl(1,"sfgc",1)
-            print(string.sub(errSL, string.find(errSL, ":") + 1))
-        end
-    end, progName, nil, {table.unpack(args, 2)})
-
-    while true do
-        local exited, code = syscall.collect(proc)
-        if exited then
-            if code then
-                print("\nTask exited with code:\n"..tostring(code))
-            end
-            return
-        end
-        if terminate then
-            local success, err = syscall.kill(proc)
-            if success then
-                syscall.devctl(1,"sbgc",16)
-                syscall.devctl(1,"sfgc",2)
-                print("\nProgram Terminated.")
-                syscall.devctl(1,"sfgc",1)
-            end
-            terminate = false
-            break
-        end
-        sleep(0.05)
-    end
-end
-
-while true do
-    local command = getUserInput()
-    if command ~= "" then
-        if command ~= commandHistory[#commandHistory] then
-            table.insert(commandHistory, command)
-        end
-        runCommand(command)
-    end
-end
-
-
---ERROR HANDLING
-end, debug.traceback)
-
-if not success then
-    syscall.log("Error running shell: "..errorMsg, "ERROR")
-    syscall.devctl(1,"sfgc",2)
-    syscall.devctl(1,"sbgc",16)
-    print()
-    print("Error running shell: ")
-    print(errorMsg)
-end

Src/Hyperion-bash/bin/hyshex

@@ -1,94 +0,0 @@
---:Minify:--
-syscall.open("/dev/tty/TTY1","r")
-syscall.open("/dev/tty/TTY1","w")
-syscall.open("/dev/null","r")
-syscall.devctl(1,"clear")
-syscall.devctl(1,"sfgc",1)
-syscall.devctl(1,"spos",1,1)
-print("HyperionOS hysh Shell")
-local str=""
-local stopInput=false
-local proc=0
-local fs=require("sys.fs")
-local timeout=false
-syscall.setEnviron("SHELL","simpleshell")
-printInline("> ")
-syscall.sigcatch(function(sig)
-    if sig==1 then
-        syscall.kill(proc)
-        print("Terminated")
-        printInline("> ")
-        stopInput=false
-    end
-end)
-
-while true do
-    if not stopInput then
-        local input=syscall.read(0)
-        if input then
-            if input=="\b" then
-                if #str>0 then
-                    str=str:sub(1,#str-1)
-                    printInline("\b")
-                end
-            elseif input=="\n" then
-                print("")
-                stopInput=true
-                if str == "" then
-                    printInline("> ")
-                    stopInput=false
-                else
-                    local path=nil
-                    local split=string.split(str, " ")
-                    if fs.exists("/bin/"..split[1]) then
-                        path="/bin/"..split[1]
-                    elseif fs.exists("/bin/"..split[1]..".lua") then
-                        path="/bin/"..split[1]..".lua"
-                    end
-                    if not path then
-                        print("Program not found")
-                        printInline("> ")
-                        stopInput=false
-                    else
-                        local text = fs.readAllText(path)
-                        local program, err = load(text, path)
-                        if not program then
-                            print(err)
-                            printInline("> ")
-                        end
-                        proc = syscall.spawn(function(...)
-                            syscall.open("/dev/tty/TTY1","r")
-                            syscall.open("/dev/tty/TTY1","w")
-                            syscall.open("/dev/null","w")
-                            program(...)
-                        end, path, nil, {table.unpack(split, 2)})
-                    end
-                    str=""
-                end
-            else
-                str=str..input
-                printInline(input)
-            end
-            timeout=false
-        else
-            timeout=true
-        end
-    else
-        local exited, code = syscall.collect(proc)
-        if exited then
-            if code then
-                print("\nTask exited with code:\n"..tostring(code))
-            end
-            printInline("> ")
-            stopInput=false
-        end
-        timeout=true
-    end
-    if timeout then
-        if stopInput then
-            sleep(.5)
-        else
-            sleep(.05)
-        end
-    end
-end

Src/Hyperion-bash/bin/ls

@@ -1,145 +0,0 @@
-local cloptions = {
-    a = false,
-    h = false,
-    l = false,
-    help = false,
-}
-
-local inpArgs = {...}
-local args = {}
-local name = syscall.getTask(syscall.getpid()).name
-
-local optToSet = false
-for _, v in pairs(inpArgs) do
-    if optToSet then
-        cloptions[optToSet] = v
-        optToSet = false
-    elseif v:sub(1, 2) == "--" then
-        local opt = v:sub(3)
-        if cloptions[opt] == nil then
-            print(name..": unrecognized option '"..v.."'.")
-            if cloptions.help ~= nil then
-                print("try '"..name.." --help' for more information.")
-            end
-            return
-        elseif cloptions[opt] == false then
-            cloptions[opt] = true
-        else
-            optToSet = opt
-        end
-    elseif v:sub(1, 1) == "-" then
-        for i = 2, #v do
-            local opt = v:sub(i, i)
-            if cloptions[opt] == nil then
-                print(name..": invalid option '-"..opt.."'.")
-                if cloptions.help ~= nil then
-                    print("try '"..name.." --help' for more information.")
-                end
-                return
-            else
-                cloptions[opt] = true
-            end
-        end
-    else
-        table.insert(args, v)
-    end
-end
-
-if cloptions.help then
-    print("Usage: "..name.." [OPTION]... [DIR]")
-    print("List all entries in the specified DIRectory, or cwd if not specified")
-    print("\nOptions:")
-    print(" -a                 Do not ignore entries starting with .")
-    print(" -h                 with -l, print sizes in a human readble format")
-    print(" -l                 Use a long listing format")
-    print(" --help         Display this help and exit")
-    return
-end
-
-local fs = require("sys.fs")
-local dir = (args[1] or "")
-if dir:sub(1, 1) ~= "/" then
-    dir = syscall.getcwd().."/"..dir
-end
-
-if dir:sub(#dir, #dir) ~= "/" then
-    dir = dir.."/"
-end
-
-if not fs.isDir(dir) then
-    print(name..": Cannot access '"..args[1].."': No such directory.")
-    return
-end
-
-
-local screenSizeStr = syscall.devctl(1, "size")
-local sizeX = tonumber(screenSizeStr:sub(1, screenSizeStr:find(";")-1))
-local sizeY = tonumber(screenSizeStr:sub(screenSizeStr:find(";")+1))
-
-local list = fs.list(dir)
-if not cloptions.a then
-    for i = #list, 1, -1 do
-        if list[i]:sub(1, 1) == "." then
-            table.remove(list, i)
-        end
-    end
-end
-
-local colWidth = 0
-local numCols = 1
-if not cloptions.l then
-    for _, item in pairs(list) do
-        if #item + 2 > colWidth then
-            colWidth = #item + 2
-        end
-    end
-    numCols = math.floor(sizeX / colWidth)
-end
-
-local sizePrefixes = {"K", "M", "G"}
-
-for i,v in ipairs(list) do
-    local fileStats = syscall.stat(dir..v)
-    local isDir = fs.isDir(dir..v)
-    if cloptions.l then
-        if isDir then
-            printInline("d")
-        else
-            printInline("-")
-        end
-        printInline("------ ")
-        printInline(fileStats.owner.." ")
-        printInline(fileStats.group.." ")
-        local size = fileStats.size
-        if cloptions.h then
-            local scale = 0
-            while size > 1024 do
-                size = size / 1024
-                scale = scale + 1
-            end
-            if scale > 0 then
-                if size < 10 then
-                    size = math.floor(size).."."..math.floor((size * 10) % 10)..sizePrefixes[scale]
-                else
-                    size = math.floor(size)..sizePrefixes[scale]
-                end
-            end
-        end
-        printInline(size.." ")
-        printInline(math.floor(fileStats.modified / 1000).." ")
-    end
-    if isDir then
-        syscall.devctl(1,"sfgc",4)
-    else
-        syscall.devctl(1,"sfgc",1)
-    end
-    printInline(v)
-    printInline((" "):rep(colWidth - #v))
-    syscall.devctl(1,"sfgc",1)
-    if i % numCols == 0 then
-        print("")
-    end
-end
-if #list % numCols ~= 0 then
-    print("")
-end

Src/Hyperion-bash/bin/luaold

@@ -1,50 +0,0 @@
---:Minify:--
-print("HyperionOS lua")
-local str=""
-local stopInput=false
-local timeout=false
-local luaEnv=setmetatable({},{__index=_ENV})
-printInline("> ")
-while true do
-    local input=syscall.read(0)
-    if input then
-        if input=="\b" then
-            if #str>0 then
-                str=str:sub(1,#str-1)
-                printInline("\b")
-            end
-        elseif input=="\n" then
-            print("")
-            stopInput=true
-            if str == "" then
-                printInline("> ")
-                stopInput=false
-            elseif str == "exit()" then
-                break
-            else
-                local func=load(str,"@Lua","t",luaEnv)
-                local ok,err = xpcall(func, debug.traceback)
-                if not ok then
-                    print(err)
-                end
-                printInline("\n> ")
-                str=""
-            end
-            str=""
-        else
-            str=str..input
-            printInline(input)
-        end
-        timeout=false
-    else
-        timeout=true
-    end
-
-    if timeout then
-        if stopInput then
-            sleep(.5)
-        else
-            sleep(.05)
-        end
-    end
-end

Src/Hyperion-bash/bin/mkdir

@@ -1,23 +0,0 @@
-local args = {...}
-local name = syscall.getTask(syscall.getpid()).name
-if #args == 0 then
-    print(name..": Missing operand.")
-    return
-end
-
-local fs = require("sys.fs")
-local newDir = args[1]
-if newDir:sub(1, 1) ~= "/" then
-    newDir = syscall.getcwd().."/"..newDir
-end
-
-if newDir:sub(#newDir, #newDir) ~= "/" then
-    newDir = newDir.."/"
-end
-
-if fs.isDir(newDir) then
-    print(name..": Cannot create directory '"..args[1].."': Directory already exists.")
-    return
-end
-
-fs.mkdir(newDir)

Src/Hyperion-bash/bin/neofetch

@@ -1,18 +0,0 @@
-local userhost = (syscall.getUsername() or "Unknown").."@"..(syscall.getHostname() or "Unknown")
-print("..               *.              .. | "..userhost)
-print(" *=             +@*             +*  | "..string.rep("-",#userhost))
-print(" .@#.          -@@@=          :#@.  | OS: "..(syscall.version() or "Unknown"))
-print("  =@@+         *@@@#         +@@=   | Host: "..(syscall.getHost() or "Unknown"))
-print("   %@@%:       *@@@#       -%@@%    | Uptime: "..(syscall.getUptime() or "Unknown"))
-print("   :@@@@+      *@@@#     .*@@@@:    | Tasks: "..tostring((#syscall.getTasks() or "Unknown")))
-print("    :*@@@%-    *@@@#    -@@@@*:     | Packages: ".."Unknown")
-print("       =%@@#.  *@@@#  .#@@%=        | Shell: "..(syscall.getEnviron("SHELL") or "Unknown"))
-print("     :=. :*@@= *@@@# =@@+: .=:      | ")
-print("      %@#=..*# +@@@# #*..=#@#       | ")
-print("      .@@@@+=# .%@%: #=+@@@@.       | ")
-print("       .....=#  -@=  *+...:.        | ")
-print("        -*%*-@=  -  =@-*%*-         | ")
-print("        -@*. -@%. :%@- :*@-         | ")
-print("              .#@#@*                | ")
-print("                -#-                 | ")
-print("                                    | ")

Src/Hyperion-bash/bin/pwd

@@ -1 +0,0 @@
-print(syscall.getcwd())

Src/Hyperion-bash/bin/startup/test.lua

@@ -1 +0,0 @@
-syscall.chown("/bin", 0, 0)

Src/Hyperion-bash/bin/su

@@ -1,80 +0,0 @@
---:Minify:--
-local fs = require("sys.fs")
-local targetUser = ({ ... })[1] or "root"
-
-local currentUid = syscall.getuid()
-local currentUser = syscall.getUsername(currentUid) or tostring(currentUid)
-
-local targetUid = syscall.auth_getuid(targetUser)
-if not targetUid then
-    print("su: user '" .. targetUser .. "' does not exist")
-    syscall.exit(1)
-    return
-end
-
-local ok, err
-if currentUid == 0 then
-    ok = true
-else
-    printInline("Password: ")
-    local pw = ""
-    while true do
-        local ch = syscall.read(0)
-        if not ch or ch == "" then
-        elseif ch == "\n" then
-            syscall.write(1, "\n")
-            break
-        elseif ch == "\b" then
-            if #pw > 0 then
-                pw = pw:sub(1, -2); syscall.write(1, "\b \b")
-            end
-        else
-            pw = pw .. ch
-            syscall.write(1, "*")
-        end
-    end
-
-    ok, err = syscall.auth_elevate(targetUser, pw)
-    if not ok then
-        sleep(1)
-        print("su: Authentication failure")
-        syscall.exit(1)
-        return
-    end
-end
-
-if currentUid == 0 then
-    syscall.setuid(targetUid)
-end
-
-local pwent   = syscall.auth_getpasswd(targetUid)
-local shell   = (pwent and pwent.shell) or "/bin/hysh"
-local homedir = (pwent and pwent.homedir) or "/"
-
-syscall.chdir(homedir)
-syscall.setEnviron("HOME", homedir)
-syscall.setEnviron("USER", targetUser)
-syscall.setEnviron("SHELL", shell)
-
-local shellText = fs.readAllText(shell)
-if not shellText then
-    print("su: shell not found: " .. shell)
-    syscall.exit(1)
-    return
-end
-
-local shellFn, loadErr = load(shellText, "@" .. shell)
-
-if not shellFn then
-    print("su: cannot load shell: " .. tostring(loadErr))
-    syscall.exit(1)
-    return
-end
-
-local success, err = syscall.kill(syscall.getppid())
-if success then
-    syscall.spawn(shellFn, targetUser .. ":" .. shell, syscall.getEnviron())
-    syscall.exit(0)
-else
-    print("su: "..err)
-end

Src/Hyperion-bash/bin/sysdump

@@ -1,5 +0,0 @@
-local syscalls=syscall.sysdump()
-for i=1, #syscalls do
-    print(syscalls[i])
-end
-print("Total # of syscalls: "..tostring(#syscalls))

Src/Hyperion-bash/bin/whoami

@@ -1 +0,0 @@
-print((syscall.getUsername() or "Unknown"))

Src/Hyperion-core/lib/io

@@ -1,5 +1,5 @@
 local io = {}
-local fs = require("sys.fs")
+local fs = require("fs")
 
 function io.open(path, mode)
     return fs.open(path, mode)

Src/Hyperion-core/lib/sys/hpv

@@ -1,6 +0,0 @@
-local sys = {}
-local fs = require("sys.fs")
-
-
-
-return sys

Src/Hyperion-core/lib/sys/init

@@ -1,5 +0,0 @@
-local sys = {}
-sys.fs = require("sys.fs")
-sys.hpv = require("sys.hpv")
-sys.ipc = require("sys.ipc")
-return sys

Src/Hyperion-core/lib/sys/ipc

@@ -1,3 +0,0 @@
-local ipc = {}
-
-return ipc

Src/Hyperion-core/lib/sys/term

@@ -1,71 +0,0 @@
-local term = {}
-
-function term.clear()
-    coroutine.yield("VFS_write", 1, "\27C\25")
-end
-
-function term.setCursorPos(x, y)
-    coroutine.yield("VFS_write", 1, "\27cs"..tostring(y)..";"..tostring(x).."\25")
-end
-
-function term.size()
-    coroutine.yield("VFS_write", 1, "\27ts\25")
-    local ok, data = coroutine.yield("VFS_read", 0, 16) -- read response
-    if not ok then error("Failed to get terminal size") end
-    local x, y = string.match(data, "%R(%d+);(%d+)\25")
-    return tonumber(x), tonumber(y)
-end
-
-function term.getCursorPos()
-    coroutine.yield("VFS_write", 1, "\27gc\25")
-    local ok, data = coroutine.yield("VFS_read", 0, 16) -- read response
-    if not ok then error("Failed to get cursor position") end
-    local y, x = string.match(data, "%R(%d+);(%d+)\25")
-    return tonumber(x), tonumber(y)
-end
-
-function term.write(data)
-    coroutine.yield("VFS_write", 1, data)
-end
-
-function term.setTextColor(color)
-    local ok, err = coroutine.yield("VFS_type", 1)
-    if not ok then error(err) end
-    if ok ~= "tty" then return end
-    coroutine.yield("VFS_write", 1, "\27f"..tostring(color).."\25")
-end
-
-function term.setBackgroundColor(color)
-    local ok, err = coroutine.yield("VFS_type", 1)
-    if not ok then error(err) end
-    if ok ~= "tty" then return end
-    coroutine.yield("VFS_write", 1, "\27b"..tostring(color).."\25")
-end
-
-function term.isColor()
-    local ok, err = coroutine.yield("VFS_type", 1)
-    if not ok then error(err) end
-    return ok == "tty"
-end
-
-function term.scroll(n)
-    coroutine.yield("VFS_write", 1, "\27S"..tostring(n).."\25")
-end
-
-function term.setDefault(color, layer)
-    if layer then
-        coroutine.yield("VFS_write", 1, "\27F"..tostring(color).."\25")
-    else
-        coroutine.yield("VFS_write", 1, "\27B"..tostring(color).."\25")
-    end
-end
-
-function term.showCursor(show)
-    if show then
-        coroutine.yield("VFS_write", 1, "\27sc\25")
-    else
-        coroutine.yield("VFS_write", 1, "\27hc\25")
-    end
-end
-
-return term

Src/Hyperion-firmware-ccpc/boot/cct/boot.lua

@@ -0,0 +1,316 @@
+-- :Minify:--
+local BOOT_DRIVE_PATH = ({...})[1] or "/$"
+---@diagnostic disable-next-line: undefined-global
+local term = term
+local os = os
+local function write(text)
+    local x, y = term.getCursorPos()
+    local w, h = term.getSize()
+
+    for i = 1, #text do
+        local c = text:sub(i, i)
+
+        if c == "\n" then
+            y = y + 1
+            x = 1
+        elseif c == "\t" then
+            local tabSize = 4
+            local spaces = tabSize - ((x - 1) % tabSize)
+            term.write(string.rep(" ", spaces))
+            x = x + spaces
+        elseif c == "\b" then
+            if x > 1 then
+                x = x - 1
+                term.setCursorPos(x, y)
+                term.write(" ")
+                term.setCursorPos(x, y)
+            end
+        else
+            if x <= w and y <= h then
+                term.setCursorPos(x, y)
+                term.write(c)
+                x = x + 1
+            end
+        end
+
+        if x > w then
+            x = 1
+            y = y + 1
+        end
+
+        if y - 1 >= h then
+            term.scroll(1)
+            y = h
+            term.setCursorPos(x, y)
+        end
+    end
+
+    term.setCursorPos(x, y)
+end
+
+local function displaySuperBadError(err)
+    term.setBackgroundColor(0x1)
+    term.setTextColor(0x4)
+    term.clear()
+    term.setCursorPos(1, 1)
+    term.write("A critical error occurred while loading the system:")
+    term.setCursorPos(1, 3)
+    write(err)
+    while true do end
+end
+
+term.setCursorBlink(false)
+local ok, err = xpcall(function()
+    local apis = {BOOT_DRIVE_PATH = BOOT_DRIVE_PATH}
+
+    local lua = {
+        coroutine = true,
+        debug = true,
+        _VERSION = true,
+        assert = true,
+        collectgarbage = true,
+        error = true,
+        gcinfo = true,
+        getfenv = true,
+        getmetatable = true,
+        ipairs = true,
+        __inext = true,
+        load = true,
+        math = true,
+        next = true,
+        pairs = true,
+        pcall = true,
+        rawequal = true,
+        rawget = true,
+        rawlen = true,
+        rawset = true,
+        select = true,
+        setfenv = true,
+        setmetatable = true,
+        string = true,
+        table = true,
+        tonumber = true,
+        tostring = true,
+        type = true,
+        xpcall = true,
+        _G = true
+    }
+
+    local debug = debug
+    for i, v in pairs(_G) do
+        if not lua[i] or lua[i] == nil then
+            apis[i] = v
+            _G[i] = nil
+        end
+    end
+
+    local acekeys={
+        [apis.keys.enter]="\n",
+        [apis.keys.tab]="\t",
+        [apis.keys.backspace]="\b",
+        [apis.keys.up]="\17",
+        [apis.keys.down]="\18",
+        [apis.keys.left]="\19",
+        [apis.keys.right]="\20",
+    }
+
+    function sleep(time)
+        local stoptime = apis.os.clock() + (time)
+        while stoptime > apis.os.clock() do end
+    end
+
+    apis.term.setPaletteColor(0x1, 0xFFFFFF) -- #000000
+    apis.term.setPaletteColor(0x2, 0xFF0000) -- #FFFFFF
+    apis.term.setPaletteColor(0x4, 0x00FF00) -- #FF0000
+    apis.term.setPaletteColor(0x8, 0x0000FF) -- #00FF00
+    apis.term.setPaletteColor(0x10, 0x00FFFF) -- #0000FF
+    apis.term.setPaletteColor(0x20, 0xFF00FF) -- #00FFFF
+    apis.term.setPaletteColor(0x40, 0xFFFF00) -- #FF00FF
+    apis.term.setPaletteColor(0x80, 0xFF6D00) -- #FFFF00
+    apis.term.setPaletteColor(0x100, 0x6DFF55) -- #FF6D00
+    apis.term.setPaletteColor(0x200, 0x24FFFF) -- #6DFF55
+    apis.term.setPaletteColor(0x400, 0x924900) -- #24FFFF
+    apis.term.setPaletteColor(0x800, 0x6D6D55) -- #924900
+    apis.term.setPaletteColor(0x1000, 0xDBDBAA) -- #6D6D55
+    apis.term.setPaletteColor(0x2000, 0x6D00FF) -- #DBDBAA
+    apis.term.setPaletteColor(0x4000, 0xB6FF00) -- #6D00FF
+    apis.term.setPaletteColor(0x8000, 0x000000) -- #B6FF00
+
+    local function getFile(path)
+        local file = apis.fs.open(path, "r")
+        if not file then
+            displaySuperBadError("Could not open file: " .. path)
+        end
+        local content = file.readAll()
+        file.close()
+        return content
+    end
+
+    local Kernel = load(getFile(BOOT_DRIVE_PATH .. "/boot/kernel.lua"),"@Kernel")
+    local initFs = load(getFile(BOOT_DRIVE_PATH .. "/boot/cct/initdisks"),"@Init_disks")(apis)
+    local fs = load(getFile(BOOT_DRIVE_PATH .. "/boot/initfs"), "@InitFs")()
+
+    if not Kernel then displaySuperBadError("Could not load kernel.") end
+    if not initFs then displaySuperBadError("Could not load initdisks.") end
+    if not fs then displaySuperBadError("Could not load initfs.") end
+
+    local eventQueue = {}
+
+    local function queueEvent(event, ...)
+        table.insert(eventQueue, {event, ...})
+    end
+
+    local computer = {
+        time = function() return apis.os.epoch("utc") end,
+        clock = function() return apis.os.clock() * 1000 end,
+        shutdown = apis.os.shutdown,
+        reboot = apis.os.reboot,
+        getMachineEvent = function()
+            if #eventQueue > 0 then
+                return table.unpack(table.remove(eventQueue, 1))
+            else
+                return nil
+            end
+        end,
+        getEEPROM = function() return getFile("/startup.lua") end,
+        setEEPROM = function(_, text)
+            local h = apis.fs.open("/startup.lua", "w")
+            h.write(text)
+            h.close()
+        end
+    }
+
+    local icolors = {
+        [0x1] = 1, -- #000000
+        [0x2] = 2, -- #FFFFFF
+        [0x4] = 3, -- #FF0000
+        [0x8] = 4, -- #00FF00
+        [0x10] = 5, -- #0000FF
+        [0x20] = 6, -- #00FFFF
+        [0x40] = 7, -- #FF00FF
+        [0x80] = 8, -- #FFFF00
+        [0x100] = 9, -- #FF6D00
+        [0x200] = 10, -- #6DFF55
+        [0x400] = 11, -- #24FFFF
+        [0x800] = 12, -- #924900
+        [0x1000] = 13, -- #6D6D55
+        [0x2000] = 14, -- #DBDBAA
+        [0x4000] = 15, -- #6D00FF
+        [0x8000] = 16 -- #B6FF00
+    }
+
+    local colors = {
+        0x0001, -- #000000
+        0x0002, -- #FFFFFF
+        0x0004, -- #FF0000
+        0x0008, -- #00FF00
+        0x0010, -- #0000FF
+        0x0020, -- #00FFFF
+        0x0040, -- #FF00FF
+        0x0080, -- #FFFF00
+        0x0100, -- #FF6D00
+        0x0200, -- #6DFF55
+        0x0400, -- #24FFFF
+        0x0800, -- #924900
+        0x1000, -- #6D6D55
+        0x2000, -- #DBDBAA
+        0x4000, -- #6D00FF
+        0x8000 -- #B6FF00
+    }
+
+    apis.term.setBackgroundColor(0x8000)
+    apis.term.setTextColor(0x1000)
+    apis.term.clear()
+    apis.term.setCursorPos(1, 1)
+
+    local kernelCoro = coroutine.create(function()
+        ---@diagnostic disable-next-line: param-type-mismatch
+        local ok, err = xpcall(Kernel, debug.traceback, apis, initFs, "cct", "/sbin/init",
+        {
+            print = function(_, text) write(text .. "\n") end,
+            printInline = function(_, text) write(text) end,
+            clear = function()
+                apis.term.clear()
+                apis.term.setCursorPos(1, 1)
+            end,
+            setCursorPos = function(_, x, y)
+                apis.term.setCursorPos(x, y)
+            end,
+            getCursorPos = function() return apis.term.getCursorPos() end,
+            getSize = function() return apis.term.getSize() end,
+            setBackgroundColor = function(_, color)
+                apis.term.setBackgroundColor(colors[color])
+            end,
+            setTextColor = function(_, color)
+                apis.term.setTextColor(colors[color])
+            end,
+            getBackgroundColor = function()
+                return icolors[apis.term.getBackgroundColor()]
+            end,
+            getTextColor = function()
+                return icolors[apis.term.getTextColor()]
+            end
+        }, computer, fs, "$")
+        if not ok then displaySuperBadError(err) end
+    end)
+
+    function coroutine.resumeWithTimeout(co, timeout, ...)
+        local startTime = computer.time()
+        debug.sethook(co, function()
+            if computer.time() > startTime + timeout then
+                return coroutine.yield("timeout")
+            end
+        end, "", 1000)
+        local ret = {coroutine.resume(co, ...)}
+        if ret[1] and ret[2] == "timeout" then
+            return "timeout"
+        elseif ret[1] == false then
+            return "error", ret[2]
+        else
+            debug.sethook(co)
+            return "success", table.unpack(ret, 2)
+        end
+    end
+
+    write("Loaded in " .. tostring(apis.os.clock()) .. " seconds.\n")
+
+    while true do
+        local status, err = coroutine.resumeWithTimeout(kernelCoro, 50)
+        apis.os.queueEvent("NoSleep")
+        local exit = false
+        while not exit do
+            local event = {coroutine.yield()}
+            if event[1] == "key" then
+                queueEvent("keyPressed", 1, event[2])
+                if acekeys[event[2]] then
+                    queueEvent("keyTyped", 1, acekeys[event[2]])
+                end
+            elseif event[1] == "char" then
+                queueEvent("keyTyped", 1, event[2])
+            elseif event[1] == "key_up" then
+                queueEvent("keyReleased", 1, event[2])
+            elseif event[1] == "disk" then
+                queueEvent("componentAdded", "disk")
+            elseif event[1] == "disk_eject" then
+                queueEvent("componentRemoved", "disk")
+            elseif event[1] == "modem_message" then
+                queueEvent("modem_message", table.unpack(event, 2))
+            elseif event[1] == "rednet_message" then
+                queueEvent("rednet_message", table.unpack(event, 2))
+            elseif event[1] == "http_success" then
+                queueEvent("http_success", table.unpack(event, 2))
+            elseif event[1] == "http_failure" then
+                queueEvent("http_failure", table.unpack(event, 2))
+            elseif event[1] == "NoSleep" then
+                exit = true
+            end
+        end
+        if status == "error" or coroutine.status(kernelCoro) == "dead" then
+            displaySuperBadError("Kernel error: " .. tostring(err))
+            coroutine.yield("key")
+        end
+    end
+end, debug.traceback)
+
+if not ok then displaySuperBadError("Fatal error during boot: " .. err) end
+while true do coroutine.yield() end

Src/Hyperion-firmware-ccpc/boot/cct/eeprom

@@ -0,0 +1,119 @@
+--:Minify:--
+local BOOT_DRIVE_PATH=({...})[1] or "/$"
+-- UnBIOS by JackMacWindows
+-- This will undo most of the changes/additions made in the BIOS, but some things may remain wrapped if `debug` is unavailable
+-- To use, just place a `bios.lua` in the root of the drive, and run this program
+-- Here's a list of things that are irreversibly changed:
+-- * both `bit` and `bit32` are kept for compatibility
+-- * string metatable blocking (on old versions of CC)
+-- In addition, if `debug` is not available these things are also irreversibly changed:
+-- * old Lua 5.1 `load` function (for loading from a function)
+-- * `loadstring` prefixing (before CC:T 1.96.0)
+-- * `http.request`
+-- * `os.shutdown` and `os.reboot`
+-- * `peripheral`
+-- * `turtle.equip[Left|Right]`
+-- Licensed under the MIT license
+local args = {...}
+local keptAPIs = {keys=true, bit32 = true, bit = true, ccemux = true, config = true, coroutine = true, debug = true, fs = true, http = true, mounter = true, os = true, periphemu = true, peripheral = true, redstone = true, rs = true, term = true, utf8 = true, _HOST = true, _CC_DEFAULT_SETTINGS = true, _CC_DISABLE_LUA51_FEATURES = true, _VERSION = true, assert = true, collectgarbage = true, error = true, gcinfo = true, getfenv = true, getmetatable = true, ipairs = true, __inext = true,load = true, loadstring = true, math = true, newproxy = true, next = true, pairs = true, pcall = true, rawequal = true, rawget = true, rawlen = true, rawset = true, select = true, setfenv = true, setmetatable = true, string = true, table = true, tonumber = true, tostring = true, type = true, unpack = true, xpcall = true, turtle = true, pocket = true, commands = true, _G = true}
+local t = {}
+for k in pairs(_G) do if not keptAPIs[k] then table.insert(t, k) end end
+for _,k in ipairs(t) do _G[k] = nil end
+local native = _G.term.native()
+for _, method in ipairs {"nativePaletteColor", "nativePaletteColour", "screenshot"} do native[method] = _G.term[method] end
+_G.term = native
+if _G.http then
+    _G.http.checkURL = _G.http.checkURLAsync
+    _G.http.websocket = _G.http.websocketAsync
+end
+if _G.commands then _G.commands = _G.commands.native end
+if _G.turtle then _G.turtle.native, _G.turtle.craft = nil end
+local delete = {os = {"version", "pullEventRaw", "pullEvent", "run", "loadAPI", "unloadAPI", "sleep"}, http = _G.http and {"get", "post", "put", "delete", "patch", "options", "head", "trace", "listen", "checkURLAsync", "websocketAsync"}, fs = {"complete", "isDriveRoot"}}
+for k,v in pairs(delete) do for _,a in ipairs(v) do _G[k][a] = nil end end
+-- Set up TLCO
+-- This functions by crashing `rednet.run` by removing `os.pullEventRaw`. Normally
+-- this would cause `parallel` to throw an error, but we replace `error` with an
+-- empty placeholder to let it continue and return without throwing. This results
+-- in the `pcall` returning successfully, preventing the error-displaying code
+-- from running - essentially making it so that `os.shutdown` is called immediately
+-- after the new BIOS exits.
+--
+-- From there, the setup code is placed in `term.native` since it's the first
+-- thing called after `parallel` exits. This loads the new BIOS and prepares it
+-- for execution. Finally, it overwrites `os.shutdown` with the new function to
+-- allow it to be the last function called in the original BIOS, and returns.
+-- From there execution continues, calling the `term.redirect` dummy, skipping
+-- over the error-handling code (since `pcall` returned ok), and calling
+-- `os.shutdown()`. The real `os.shutdown` is re-added, and the new BIOS is tail
+-- called, which effectively makes it run as the main chunk.
+local olderror = error
+_G.error = function() end
+_G.term.redirect = function() end
+function _G.term.native()
+    _G.term.native = nil
+    _G.term.redirect = nil
+    _G.error = olderror
+    term.setBackgroundColor(32768)
+    term.setTextColor(1)
+    term.setCursorPos(1, 1)
+    term.setCursorBlink(true)
+    term.clear()
+    local file = fs.open(BOOT_DRIVE_PATH.."/boot/cct/boot.lua", "r")
+    if file == nil then
+        term.setCursorBlink(false)
+        term.setTextColor(16384)
+        term.write("Could not find /boot/cct/boot.lua. UnBIOS cannot continue.")
+        term.setCursorPos(1, 2)
+        term.write("Press any key to continue")
+        coroutine.yield("key")
+        os.shutdown()
+    end
+    local fn, err = loadstring(file.readAll(), "@bootloader")
+    file.close()
+    if fn == nil then
+        term.setCursorBlink(false)
+        term.setTextColor(16384)
+        term.write("Could not load /boot/cc/boot.lua. UnBIOS cannot continue.")
+        term.setCursorPos(1, 2)
+        term.write(err)
+        term.setCursorPos(1, 3)
+        term.write("Press any key to continue")
+        coroutine.yield("key")
+        os.shutdown()
+    end
+    setfenv(fn, _G)
+    local oldshutdown = os.shutdown
+    os.shutdown = function()
+        os.shutdown = oldshutdown
+        return fn(BOOT_DRIVE_PATH)
+    end
+end
+if debug then
+    -- Restore functions that were overwritten in the BIOS
+    -- Apparently this has to be done *after* redefining term.native
+    local function restoreValue(tab, idx, name, hint)
+        local i, key, value = 1, debug.getupvalue(tab[idx], hint)
+        while key ~= name and key ~= nil do
+            key, value = debug.getupvalue(tab[idx], i)
+            i=i+1
+        end
+        tab[idx] = value or tab[idx]
+    end
+    restoreValue(_G, "loadstring", "nativeloadstring", 1)
+    restoreValue(_G, "load", "nativeload", 5)
+    if http then restoreValue(http, "request", "nativeHTTPRequest", 3) end
+    restoreValue(os, "shutdown", "nativeShutdown", 1)
+    restoreValue(os, "reboot", "nativeReboot", 1)
+    if turtle then
+        restoreValue(turtle, "equipLeft", "v", 1)
+        restoreValue(turtle, "equipRight", "v", 1)
+    end
+    do
+        local i, key, value = 1, debug.getupvalue(peripheral.isPresent, 2)
+        while key ~= "native" and key ~= nil do
+            key, value = debug.getupvalue(peripheral.isPresent, i)
+            i=i+1
+        end
+        _G.peripheral = value or peripheral
+    end
+end

Src/Hyperion-firmware-ccpc/boot/cct/initdisks

@@ -0,0 +1,155 @@
+-- :Minify:--
+local apis = ({...})[1]
+local BOOT_DRIVE_PATH = apis.BOOT_DRIVE_PATH or "/$"
+local fs = apis.fs
+local native = apis.peripheral
+local peripheral = {}
+local sides = {"top", "bottom", "left", "right", "front", "back"}
+
+function peripheral.getType(name)
+    if native.isPresent(name) then return native.getType(name) end
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and
+            native.call(side, "isPresentRemote", name) then
+            return native.call(side, "getTypeRemote", name)
+        end
+    end
+    return nil
+end
+
+function peripheral.getNames()
+    local names = {}
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.isPresent(side) then table.insert(names, side) end
+        if native.hasType(side, "peripheral_hub") then
+            local hubSides = native.call(side, "getConnectedSides")
+            for _, hubSide in ipairs(hubSides) do
+                table.insert(names, hubSide)
+            end
+        end
+    end
+    return names
+end
+
+local disks = {}
+local internal = {}
+
+local function norm(path)
+    if not path or path == "" then return "/" end
+    return fs.combine("/", path)
+end
+
+local function createDisk(id, basePath, readonly, periph)
+    basePath = norm(basePath)
+
+    local disk = {address = id, isReadOnly = function() return readonly end}
+
+    function disk:spaceUsed()
+        return fs.getCapacity(basePath) - fs.getFreeSpace(basePath)
+    end
+
+    function disk:spaceTotal() return fs.getCapacity(basePath) end
+
+    function disk:list(path)
+        local p = fs.combine(basePath, path)
+        if not fs.exists(p) or not fs.isDir(p) then
+            return nil, "not directory"
+        end
+        return fs.list(p)
+    end
+
+    function disk:fileExists(path)
+        local p = fs.combine(basePath, path)
+        return fs.exists(p) and not fs.isDir(p)
+    end
+
+    function disk:directoryExists(path)
+        local p = fs.combine(basePath, path)
+        return fs.exists(p) and fs.isDir(p)
+    end
+
+    function disk:type(path)
+        local p = fs.combine(basePath, path)
+        if not fs.exists(p) then
+            return nil
+        elseif fs.isDir(p) then
+            return "directory"
+        else
+            return "file"
+        end
+    end
+
+    function disk:makeDirectory(path)
+        local p = fs.combine(basePath, path)
+        fs.makeDir(p)
+        return true
+    end
+
+    function disk:remove(path)
+        local p = fs.combine(basePath, path)
+        if fs.exists(p) then fs.delete(p) end
+        return true
+    end
+
+    function disk:setLabel(label) periph.setLabel(label) end
+
+    function disk:getLabel(label) return periph.getLabel() end
+
+    function disk:attributes(path)
+        local p = fs.combine(basePath, path)
+        return fs.attributes(p)
+    end
+
+    function disk:open(path, mode)
+        local p = fs.combine(basePath, path)
+        return fs.open(p, mode)
+    end
+
+    return disk
+end
+
+internal["$"] = createDisk("$", BOOT_DRIVE_PATH, false, {
+    setLabel = function(label)
+        local h = fs.open("/.label", "w")
+        h.write(label)
+        h.close()
+    end,
+    getLabel = function()
+        local h = fs.open("/.label", "r")
+        if not h then return "$" end
+        local label = h.readAll()
+        h.close()
+        return label
+    end
+})
+
+local function refresh()
+    for id, _ in pairs(disks) do
+        if not peripheral.getType(id) then disks[id] = nil end
+    end
+
+    for _, name in ipairs(peripheral.getNames()) do
+        if peripheral.getType(name) == "disk" then
+            if not disks[name] then
+                local mount = disk.getMountPath(name)
+                if mount then
+                    disks[name] = createDisk(name, mount, false, disk)
+                end
+            end
+        end
+    end
+end
+
+local function iter()
+    refresh()
+    local combined = {}
+
+    for id, obj in pairs(internal) do combined[id] = obj end
+    for id, obj in pairs(disks) do combined[id] = obj end
+
+    return pairs(combined)
+end
+
+return {refresh = refresh, list = iter}

Src/Hyperion-firmware-ccpc/lib/modules/ccpc/25_gfx.kmod

@@ -0,0 +1,394 @@
+--:Minify:--
+local kernel = ...
+local apis = kernel.apis
+local native = apis.peripheral
+local sides = {"top", "bottom", "left", "right", "front", "back"}
+local peripheral={}
+
+function peripheral.getNames()
+    local results = {}
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.isPresent(side) then
+            table.insert(results, side)
+            if native.hasType(side, "peripheral_hub") then
+                local remote = native.call(side, "getNamesRemote")
+                for _, name in ipairs(remote) do
+                    table.insert(results, name)
+                end
+            end
+        end
+    end
+    return results
+end
+
+function peripheral.isPresent(name)
+    if native.isPresent(name) then
+        return true
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return true
+        end
+    end
+    return false
+end
+
+function peripheral.getType(peripheral)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.getType(peripheral)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "getTypeRemote", peripheral)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return table.unpack(mt.types)
+    end
+end
+
+function peripheral.hasType(peripheral, peripheral_type)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.hasType(peripheral, peripheral_type)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return mt.types[peripheral_type] ~= nil
+    end
+end
+
+function peripheral.getMethods(name)
+    if native.isPresent(name) then
+        return native.getMethods(name)
+    end
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "getMethodsRemote", name)
+        end
+    end
+    return nil
+end
+
+function peripheral.getName(peripheral)
+    local mt = getmetatable(peripheral)
+    if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
+        error("bad argument #1 (table is not a peripheral)", 2)
+    end
+    return mt.name
+end
+
+function peripheral.call(name, method, ...)
+    if native.isPresent(name) then
+        return native.call(name, method, ...)
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "callRemote", name, method, ...)
+        end
+    end
+    return nil
+end
+
+function peripheral.wrap(name)
+    local methods = peripheral.getMethods(name)
+    if not methods then
+        return nil
+    end
+
+    local types = { peripheral.getType(name) }
+    for i = 1, #types do types[types[i]] = true end
+    local result = setmetatable({}, {
+        __name = "peripheral",
+        name = name,
+        type = types[1],
+        types = types,
+    })
+    for _, method in ipairs(methods) do
+        result[method] = function(...)
+            return peripheral.call(name, method, ...)
+        end
+    end
+    return result
+end
+
+function peripheral.find(ty, filter)
+    local results = {}
+    for _, name in ipairs(peripheral.getNames()) do
+        if peripheral.hasType(name, ty) then
+            local wrapped = peripheral.wrap(name)
+            if filter == nil or filter(name, wrapped) then
+                table.insert(results, wrapped)
+            end
+        end
+    end
+    return table.unpack(results)
+end
+
+local icolors = {
+    [0x1] = 1, -- #000000
+    [0x2] = 2, -- #FFFFFF
+    [0x4] = 3, -- #FF0000
+    [0x8] = 4, -- #00FF00
+    [0x10] = 5, -- #0000FF
+    [0x20] = 6, -- #00FFFF
+    [0x40] = 7, -- #FF00FF
+    [0x80] = 8, -- #FFFF00
+    [0x100] = 9, -- #FF6D00
+    [0x200] = 10, -- #6DFF55
+    [0x400] = 11, -- #24FFFF
+    [0x800] = 12, -- #924900
+    [0x1000] = 13, -- #6D6D55
+    [0x2000] = 14, -- #DBDBAA
+    [0x4000] = 15, -- #6D00FF
+    [0x8000] = 16 -- #B6FF00
+}
+
+local colors = {
+    0x0001, -- #000000
+    0x0002, -- #FFFFFF
+    0x0004, -- #FF0000
+    0x0008, -- #00FF00
+    0x0010, -- #0000FF
+    0x0020, -- #00FFFF
+    0x0040, -- #FF00FF
+    0x0080, -- #FFFF00
+    0x0100, -- #FF6D00
+    0x0200, -- #6DFF55
+    0x0400, -- #24FFFF
+    0x0800, -- #924900
+    0x1000, -- #6D6D55
+    0x2000, -- #DBDBAA
+    0x4000, -- #6D00FF
+    0x8000 -- #B6FF00
+}
+
+local function write(text, term)
+    local x, y = term.getCursorPos()
+    local w, h = term.getSize()
+
+    for i = 1, #text do
+        local c = text:sub(i, i)
+
+        if c == "\n" then
+            y = y + 1
+            x = 1
+        elseif c == "\t" then
+            local tabSize = 4
+            local spaces = tabSize - ((x - 1) % tabSize)
+            term.write(string.rep(" ", spaces))
+            x = x + spaces
+        elseif c == "\b" then
+            if x > 1 then
+                x = x - 1
+                term.setCursorPos(x, y)
+                term.write(" ")
+                term.setCursorPos(x, y)
+            end
+        else
+            if x <= w and y <= h then
+                term.setCursorPos(x, y)
+                term.write(c)
+                x = x + 1
+            end
+        end
+
+        if x > w then
+            x = 1
+            y = y + 1
+        end
+
+        if y - 1 >= h then
+            term.scroll(1)
+            y = h
+            term.setCursorPos(x, y)
+        end
+    end
+
+    term.setCursorPos(x, y)
+end
+
+kernel.devfs.data.tty={}
+local ctrl,alt = false, false
+
+local function serializeBool(bool)
+    if bool then
+        return "T"
+    else
+        return "F"
+    end
+end
+
+local function newtty(obj, id, ev)
+    kernel.devfs.data["tty"][id] = function(op, mode)
+        if op=="type" then
+            return "character device"
+        elseif op=="open" then
+            local h = {
+                read=function(amount)
+                    local rv=""
+                    for i=1, amount or 1 do
+                        local event = {ev()}
+                        if event[1] then
+                            rv=rv..event[1]
+                        end
+                    end
+                    if rv=="" then rv=nil end
+                    return rv
+                end,
+                write=function(content)
+                    write(content, obj)
+                end,
+                size=function()
+                    local s={obj.getSize()}
+                    return table.concat(s,";")
+                end,
+                clear=function()
+                    obj.clear()
+                    obj.setCursorPos(1,1)
+                end,
+                gpos=function()
+                    local s={obj.getCursorPos()}
+                    return table.concat(s,";")
+                end,
+                spos=function(x,y)
+                    return obj.setCursorPos(x,y)
+                end,
+                sfgc=function(c)
+                    return obj.setTextColor(colors[c])
+                end,
+                sbgc=function(c)
+                    return obj.setBackgroundColor(colors[c])
+                end,
+                gfgc=function()
+                    return icolors[obj.getTextColor()]
+                end,
+                gbgc=function()
+                    return icolors[obj.getBackgroundColor()]
+                end,
+                gctrl=function()
+                    return serializeBool(ctrl)..";"..serializeBool(alt)
+                end
+            }
+            if mode=="rw" then
+                return h
+            elseif mode=="r" then
+                h["write"]=nil
+                return h
+            elseif mode=="w" then
+                h["read"]=nil
+                return h
+            end
+        end
+    end
+end
+
+local fifo = kernel.newFifo()
+
+kernel.processes.cctmond = function()
+    local timeout = false
+    while true do
+        local event = {kernel.computer:getMachineEvent()}
+
+        if event[1] then
+            local eventType = event[1]
+            local charOrKey = event[3]
+
+            local ctrlKeyMap = {
+                [apis.keys.a]=1,  [apis.keys.b]=2,  [apis.keys.c]=3,
+                [apis.keys.d]=4,  [apis.keys.e]=5,  [apis.keys.f]=6,
+                [apis.keys.g]=7,  [apis.keys.h]=8,  [apis.keys.i]=9,
+                [apis.keys.j]=10, [apis.keys.k]=11, [apis.keys.l]=12,
+                [apis.keys.m]=13, [apis.keys.n]=14, [apis.keys.o]=15,
+                [apis.keys.p]=16, [apis.keys.q]=17, [apis.keys.r]=18,
+                [apis.keys.s]=19, [apis.keys.t]=20, [apis.keys.u]=21,
+                [apis.keys.v]=22, [apis.keys.w]=23, [apis.keys.x]=24,
+                [apis.keys.y]=25, [apis.keys.z]=26,
+            }
+
+            if eventType == "keyPressed" then
+                if charOrKey == apis.keys.leftCtrl or charOrKey == apis.keys.rightCtrl then
+                    ctrl = true
+                elseif charOrKey == apis.keys.leftAlt or charOrKey == apis.keys.rightAlt then
+                    alt = true
+                end
+
+                if ctrl then
+                    local ctrlByte = ctrlKeyMap[charOrKey]
+                    if ctrlByte then
+                        if ctrlByte == 3 then
+                            for _, task in ipairs(syscall.getTasks()) do
+                                syscall.sigsend(task, 1)
+                            end
+                        else
+                            fifo.push(string.char(ctrlByte))
+                        end
+                    end
+                else
+                    local specialKeyMap = {
+                        [apis.keys.up]        = "",
+                        [apis.keys.down]      = "",
+                        [apis.keys.right]     = "",
+                        [apis.keys.left]      = "",
+                        [apis.keys.home]      = "",
+                        [apis.keys["end"]]    = "",
+                        [apis.keys.pageUp]    = "[5~",
+                        [apis.keys.pageDown]  = "[6~",
+                        [apis.keys.delete]    = "[3~",
+                    }
+                    local special = specialKeyMap[charOrKey]
+                    if special then fifo.push(special) end
+                end
+
+            elseif eventType == "keyReleased" then
+                if charOrKey == apis.keys.leftCtrl or charOrKey == apis.keys.rightCtrl then
+                    ctrl = false
+                elseif charOrKey == apis.keys.leftAlt or charOrKey == apis.keys.rightAlt then
+                    alt = false
+                end
+
+            elseif eventType == "keyTyped" then
+                if charOrKey then fifo.push(charOrKey) end
+            end
+
+            timeout = false
+        else
+            timeout = true
+        end
+
+        if timeout then
+            sleep(0.05)
+        end
+    end
+end
+
+newtty(apis.term, "1", fifo.pop)
+
+for i,v in ipairs({peripheral.find("monitor")}) do
+    v.setTextScale(.5)
+    v.write("Initializing...")
+    newtty(v,tostring(i+1),function () end)
+end

Src/Hyperion-firmware-cct/boot/cct/boot.lua

@@ -71,7 +71,6 @@ local ok, err = xpcall(function()
         collectgarbage = true,
         error = true,
         gcinfo = true,
-        getfenv = true,
         getmetatable = true,
         ipairs = true,
         __inext = true,
@@ -85,7 +84,6 @@ local ok, err = xpcall(function()
         rawlen = true,
         rawset = true,
         select = true,
-        setfenv = true,
         setmetatable = true,
         string = true,
         table = true,
@@ -254,7 +252,6 @@ local ok, err = xpcall(function()
         if not ok then displaySuperBadError(err) end
     end)
 
-    -- time is in milliseconds
     function coroutine.resumeWithTimeout(co, timeout, ...)
         local startTime = computer.time()
         debug.sethook(co, function()
@@ -294,6 +291,14 @@ local ok, err = xpcall(function()
                 queueEvent("componentAdded", "disk")
             elseif event[1] == "disk_eject" then
                 queueEvent("componentRemoved", "disk")
+            elseif event[1] == "modem_message" then
+                queueEvent("modem_message", table.unpack(event, 2))
+            elseif event[1] == "rednet_message" then
+                queueEvent("rednet_message", table.unpack(event, 2))
+            elseif event[1] == "http_success" then
+                queueEvent("http_success", table.unpack(event, 2))
+            elseif event[1] == "http_failure" then
+                queueEvent("http_failure", table.unpack(event, 2))
             elseif event[1] == "NoSleep" then
                 exit = true
             end

Src/Hyperion-firmware-cct/boot/cct/initdisks

@@ -6,31 +6,147 @@ local native = apis.peripheral
 local peripheral = {}
 local sides = {"top", "bottom", "left", "right", "front", "back"}
 
-function peripheral.getType(name)
+function peripheral.getNames()
-    if native.isPresent(name) then return native.getType(name) end
+    local results = {}
     for n = 1, #sides do
         local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and
+        if native.isPresent(side) then
-            native.call(side, "isPresentRemote", name) then
+            table.insert(results, side)
-            return native.call(side, "getTypeRemote", name)
+            if native.hasType(side, "peripheral_hub") then
+                local remote = native.call(side, "getNamesRemote")
+                for _, name in ipairs(remote) do
+                    table.insert(results, name)
+                end
+            end
+        end
+    end
+    return results
+end
+
+function peripheral.isPresent(name)
+    if native.isPresent(name) then
+        return true
+    end
+
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return true
+        end
+    end
+    return false
+end
+
+function peripheral.getType(peripheral)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.getType(peripheral)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "getTypeRemote", peripheral)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return table.unpack(mt.types)
+    end
+end
+
+function peripheral.hasType(peripheral, peripheral_type)
+    if type(peripheral) == "string" then
+        if native.isPresent(peripheral) then
+            return native.hasType(peripheral, peripheral_type)
+        end
+        for n = 1, #sides do
+            local side = sides[n]
+            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
+                return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
+            end
+        end
+        return nil
+    else
+        local mt = getmetatable(peripheral)
+        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
+            error("bad argument #1 (table is not a peripheral)", 2)
+        end
+        return mt.types[peripheral_type] ~= nil
+    end
+end
+
+function peripheral.getMethods(name)
+    if native.isPresent(name) then
+        return native.getMethods(name)
+    end
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+            return native.call(side, "getMethodsRemote", name)
         end
     end
     return nil
 end
 
-function peripheral.getNames()
+function peripheral.getName(peripheral)
-    local names = {}
+    local mt = getmetatable(peripheral)
+    if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
+        error("bad argument #1 (table is not a peripheral)", 2)
+    end
+    return mt.name
+end
+
+function peripheral.call(name, method, ...)
+    if native.isPresent(name) then
+        return native.call(name, method, ...)
+    end
+
     for n = 1, #sides do
         local side = sides[n]
-        if native.isPresent(side) then table.insert(names, side) end
+        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
-        if native.hasType(side, "peripheral_hub") then
+            return native.call(side, "callRemote", name, method, ...)
-            local hubSides = native.call(side, "getConnectedSides")
+        end
-            for _, hubSide in ipairs(hubSides) do
+    end
-                table.insert(names, hubSide)
+    return nil
+end
+
+function peripheral.wrap(name)
+    local methods = peripheral.getMethods(name)
+    if not methods then
+        return nil
+    end
+
+    local types = { peripheral.getType(name) }
+    for i = 1, #types do types[types[i]] = true end
+    local result = setmetatable({}, {
+        __name = "peripheral",
+        name = name,
+        type = types[1],
+        types = types,
+    })
+    for _, method in ipairs(methods) do
+        result[method] = function(...)
+            return peripheral.call(name, method, ...)
+        end
+    end
+    return result
+end
+
+function peripheral.find(ty, filter)
+    local results = {}
+    for _, name in ipairs(peripheral.getNames()) do
+        if peripheral.hasType(name, ty) then
+            local wrapped = peripheral.wrap(name)
+            if filter == nil or filter(name, wrapped) then
+                table.insert(results, wrapped)
             end
         end
     end
-    return names
+    return table.unpack(results)
 end
 
 local disks = {}
@@ -130,14 +246,9 @@ local function refresh()
         if not peripheral.getType(id) then disks[id] = nil end
     end
 
-    for _, name in ipairs(peripheral.getNames()) do
+    for _, disk in ipairs({peripheral.find("drive")}) do
-        if peripheral.getType(name) == "disk" then
+        if disk.isDiskPresent() then
-            if not disks[name] then
+            disks[tostring(disk.getDiskID())]=createDisk("cctdisk"..tostring(disk.getDiskID()), disk.getMountPath(), false, fs)
-                local mount = disk.getMountPath(name)
-                if mount then
-                    disks[name] = createDisk(name, mount, false, disk)
-                end
-            end
         end
     end
 end

Src/Hyperion-firmware-cct/lib/modules/cc-tweaked/25_tty.kmod

@@ -1,4 +1,5 @@
--- :Minify:--
+--:Minify:--
+
 local kernel = ...
 local apis = kernel.apis
 local native = apis.peripheral
@@ -37,7 +38,7 @@ function peripheral.isPresent(name)
 end
 
 function peripheral.getType(peripheral)
-    if type(peripheral) == "string" then -- Peripheral name passed
+    if type(peripheral) == "string" then
         if native.isPresent(peripheral) then
             return native.getType(peripheral)
         end
@@ -58,7 +59,7 @@ function peripheral.getType(peripheral)
 end
 
 function peripheral.hasType(peripheral, peripheral_type)
-    if type(peripheral) == "string" then -- Peripheral name passed
+    if type(peripheral) == "string" then
         if native.isPresent(peripheral) then
             return native.hasType(peripheral, peripheral_type)
         end
@@ -243,6 +244,22 @@ local function serializeBool(bool)
 end
 
 local function newtty(obj, id, ev)
+    obj.setPaletteColor(0x1, 0xFFFFFF) -- #000000
+    obj.setPaletteColor(0x2, 0xFF0000) -- #FFFFFF
+    obj.setPaletteColor(0x4, 0x00FF00) -- #FF0000
+    obj.setPaletteColor(0x8, 0x0000FF) -- #00FF00
+    obj.setPaletteColor(0x10, 0x00FFFF) -- #0000FF
+    obj.setPaletteColor(0x20, 0xFF00FF) -- #00FFFF
+    obj.setPaletteColor(0x40, 0xFFFF00) -- #FF00FF
+    obj.setPaletteColor(0x80, 0xFF6D00) -- #FFFF00
+    obj.setPaletteColor(0x100, 0x6DFF55) -- #FF6D00
+    obj.setPaletteColor(0x200, 0x24FFFF) -- #6DFF55
+    obj.setPaletteColor(0x400, 0x924900) -- #24FFFF
+    obj.setPaletteColor(0x800, 0x6D6D55) -- #924900
+    obj.setPaletteColor(0x1000, 0xDBDBAA) -- #6D6D55
+    obj.setPaletteColor(0x2000, 0x6D00FF) -- #DBDBAA
+    obj.setPaletteColor(0x4000, 0xB6FF00) -- #6D00FF
+    obj.setPaletteColor(0x8000, 0x000000) -- #B6FF00
     kernel.devfs.data["tty"][id] = function(op, mode)
         if op=="type" then
             return "character device"
@@ -317,7 +334,18 @@ kernel.processes.cctmond = function()
             local eventType = event[1]
             local charOrKey = event[3]
 
-            -- Update modifier keys
+            local ctrlKeyMap = {
+                [apis.keys.a]=1,  [apis.keys.b]=2,  [apis.keys.c]=3,
+                [apis.keys.d]=4,  [apis.keys.e]=5,  [apis.keys.f]=6,
+                [apis.keys.g]=7,  [apis.keys.h]=8,  [apis.keys.i]=9,
+                [apis.keys.j]=10, [apis.keys.k]=11, [apis.keys.l]=12,
+                [apis.keys.m]=13, [apis.keys.n]=14, [apis.keys.o]=15,
+                [apis.keys.p]=16, [apis.keys.q]=17, [apis.keys.r]=18,
+                [apis.keys.s]=19, [apis.keys.t]=20, [apis.keys.u]=21,
+                [apis.keys.v]=22, [apis.keys.w]=23, [apis.keys.x]=24,
+                [apis.keys.y]=25, [apis.keys.z]=26,
+            }
+
             if eventType == "keyPressed" then
                 if charOrKey == apis.keys.leftCtrl or charOrKey == apis.keys.rightCtrl then
                     ctrl = true
@@ -325,11 +353,31 @@ kernel.processes.cctmond = function()
                     alt = true
                 end
 
-                -- Handle Ctrl+C
+                if ctrl then
-                if ctrl and charOrKey == apis.keys.c then
+                    local ctrlByte = ctrlKeyMap[charOrKey]
+                    if ctrlByte then
+                        if ctrlByte == 3 then
                             for _, task in ipairs(syscall.getTasks()) do
-                        syscall.sigsend(task, 1) -- SIGINT
+                                syscall.sigsend(task, 1)
                             end
+                        else
+                            fifo.push(string.char(ctrlByte))
+                        end
+                    end
+                else
+                    local specialKeyMap = {
+                        [apis.keys.up]        = "",
+                        [apis.keys.down]      = "",
+                        [apis.keys.right]     = "",
+                        [apis.keys.left]      = "",
+                        [apis.keys.home]      = "",
+                        [apis.keys["end"]]    = "",
+                        [apis.keys.pageUp]    = "[5~",
+                        [apis.keys.pageDown]  = "[6~",
+                        [apis.keys.delete]    = "[3~",
+                    }
+                    local special = specialKeyMap[charOrKey]
+                    if special then fifo.push(special) end
                 end
 
             elseif eventType == "keyReleased" then
@@ -354,10 +402,10 @@ kernel.processes.cctmond = function()
     end
 end
 
-newtty(apis.term, "TTY1", fifo.pop)
+newtty(apis.term, "1", fifo.pop)
 
 for i,v in ipairs({peripheral.find("monitor")}) do
     v.setTextScale(.5)
     v.write("Initializing...")
-    newtty(v,"TTY"..tostring(i+1),function () end)
+    newtty(v,tostring(i+1),function () end)
 end

Src/Hyperion-kernel/boot/fstab

@@ -1,3 +1,4 @@
 U $;/
 U devfs0000;/dev/
 U tmpfs0000;/tmp/
+U procfs0000;/proc/

Src/Hyperion-kernel/boot/kernel.lua

@@ -8,7 +8,7 @@ local computer = args[6]
 local ifs = args[7]
 local kernel = {}
 kernel.LOG_Text=""
-kernel.version="HyperionOS V1.0.0"
+kernel.version="HyperionOS V1.2.3"
 kernel.process = "Kernel"
 kernel.users={[0]="root",[1]="User"}
 kernel.hostname = "hyperion"
@@ -27,15 +27,15 @@ local windowsExp = false
 
 function kernel.log(msg, level, c)
     c=c or 12
-    kernel.LOG_Text = kernel.LOG_Text..tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n"
+    kernel.LOG_Text = kernel.LOG_Text..string.format("%X",c-1).." "..tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n"
     if kernel.status == "start" then
         screen:setTextColor(c)
-        screen:print(string.format("%X",c-1).." "..tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
+        screen:print(tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
     elseif kernel.status == "term" then
         kernel.standbyTask=kernel.currentTask
         kernel.currentTask=kernel.kernelTask
         kernel.vfs.devctl(1,"sfgc",c)
-        kernel.vfs.write(1,string.format("%X",c-1).." "..tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n")
+        kernel.vfs.write(1,tostring(computer:time()).." "..kernel.users[kernel.uid].." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n")
         kernel.currentTask=kernel.standbyTask
     end
 end
@@ -113,8 +113,9 @@ local split = function(str, delim, maxResultCountOrNil)
 end
 
 if not ifs.isFile("/boot/boot.cfg") then
-    kernel.log("boot.cfg missing or corrupted!, Attempting to write recovery boot.cfg", "ERROR", 2)
+    kernel.log("First boot detected writing boot.cfg", "INFO", 3)
     ifs.writeAllText("/boot/boot.cfg",ifs.readAllText("/boot/safeboot.cfg"))
+    kernel.firstBoot=true
 end
 
 local initCfgFunc, err = load(ifs.readAllText("/boot/boot.cfg"), "@boot.cfg")
@@ -184,10 +185,17 @@ end
 
 kernel.log("Gathering modules")
 for _, i in ipairs(ifs.list("/lib/modules")) do
-    for _,v in ipairs(ifs.list("/lib/modules/"..i)) do
+    local modlist = ifs.list("/lib/modules/"..i)
+    if not modlist then
+        kernel.log("WARNING: could not list /lib/modules/"..i.." (skipping)", "WARN", 8)
+    else
+        for _,v in ipairs(modlist) do
             local prior=tonumber(v:sub(1,2))
+            if prior then
                 modules[prior+1][#modules[prior+1]+1]="/lib/modules/"..i.."/"..v
             end
+        end
+    end
 end
 
 kernel.ifs=ifs
@@ -244,7 +252,12 @@ kernel.syscalls["sysdump"]=function()
     end
     return rv
 end
-kernel.syscalls["test"]=function() return true end
+kernel.syscalls["reboot"]=function()
+    kernel.computer:reboot()
+end
+kernel.syscalls["shutdown"]=function()
+    kernel.computer:reboot()
+end
 
 kernel.log("Running modules")
 for _,p in ipairs(modules) do
@@ -265,6 +278,7 @@ for _,p in ipairs(modules) do
 end
 
 kernel.log("Kernel initialized successfully.")
+kernel.saveLog()
 kernel.status="running"
 kernel.main()
 if kernel.status=="panic" then

Src/Hyperion-kernel/boot/safeboot.cfg

@@ -4,7 +4,7 @@
 -- This file is auto-generated during the build process.
 -- DEFAULT BOOT CONFIGURATION FILE
 return {
-    initPath = "/sbin/init.lua",
+    initPath = "/sbin/init",
     maxOpenFiles = 128,
     maxFilesPerTask = 16,
     preempt=true

Src/Hyperion-kernel/lib/modules/Hyperion/10_vfs.kmod

@@ -1,629 +0,0 @@
--- :Minify:--
-local kernel = ...
-local vfs = {}
-kernel.vfs = vfs
-vfs.mounts = {["$"] = "/"}
-vfs.disks = kernel.disks
-
--- Path normalization
-local function normalizePath(path)
-    local task = kernel.currentTask
-    local cwd = task.cwd or "/"
-    if path:sub(1, 1) ~= "/" then path = cwd .. "/" .. path end
-    local parts = {}
-    for part in path:gmatch("[^/]+") do
-        if part == ".." then
-            if #parts > 0 then table.remove(parts) end
-        elseif part ~= "." and part ~= "" then
-            table.insert(parts, part)
-        end
-    end
-    return "/" .. table.concat(parts, "/")
-end
-
-function vfs.splitPath(path)
-    local rv=string.split(path,"/")
-    while table.indexOf(rv, "") ~= -1 do
-        table.remove(rv, table.indexOf(rv, ""))
-    end
-    return rv
-end
-
--- Resolve mount and disk path
-local function resolvePath(path)
-    path = normalizePath(path)
-
-    local mountPoint = nil
-    local mountId = nil
-
-    for id, mp in pairs(vfs.mounts) do
-        if path == mp or (mp == "/" and path:sub(1, 1) == "/") or path:sub(1, #mp + 1) == mp .. "/" then
-            if not mountPoint or #mp > #mountPoint then
-                mountPoint = mp
-                mountId = id
-            end
-        end
-    end
-
-    if not mountId then
-        error("ENODEV")
-    end
-
-    local diskPath = path:sub(#mountPoint + 1)
-    if diskPath == "" then
-        diskPath = "/"
-    end
-
-    if kernel.config.logPathResolution then
-        kernel.log("Path '"..path.."' resolved to disk '"..mountId.."' and path '"..diskPath.."'")
-    end
-
-    return vfs.disks[mountId], diskPath
-end
-
--- Allocate file descriptor for current task
-local function allocFD(task)
-    local fd = 0
-    while task.fd[fd] do fd = fd + 1 end
-    if fd >= kernel.config.maxFilesPerTask then error("ENFILE") end
-    return fd
-end
-
--- System-wide open file limit
-local total = 0
-local function checkSystemLimit()
-    if total >= kernel.config.maxOpenFiles - 16 then error("ENFILE") end
-end
-
--- File object constructor
-local function newFileObj(handle, mode, path, meta, type)
-    return {
-        handle = handle,
-        mode = mode,
-        path = path,
-        meta = meta,
-        type = type,
-        refcount = 1
-    }
-end
-
-function vfs.newfd(fdobj)
-    checkSystemLimit()
-    total=total+1
-    local fd = allocFD(kernel.currentTask)
-    kernel.currentTask.fd[fd]=fdobj
-end
-
--- Parse metafile
-local function parseMetafile(file)
-    if not file or file == "" then return {} end
-
-    local ret = {}
-    local pointer = 1
-
-    while pointer <= #file do
-        local namelen = file:byte(pointer)
-        pointer = pointer + 1
-
-        local name = file:sub(pointer, pointer + namelen - 1)
-        pointer = pointer + namelen
-
-        local owner = file:byte(pointer)
-        local group = file:byte(pointer + 1)
-        local perms = file:byte(pointer + 2)
-        pointer = pointer + 3
-
-        local cmetalen = file:byte(pointer)
-        pointer = pointer + 1
-
-        local cmeta = ""
-        if cmetalen > 0 then
-            cmeta = file:sub(pointer, pointer + cmetalen - 1)
-            pointer = pointer + cmetalen
-        end
-
-        ret[name] = {owner = owner, group = group, perms = perms, cmeta = cmeta}
-    end
-
-    return ret
-end
-
--- Build metafile
-local function makeMetafile(meta)
-    local file = ""
-    for name, m in pairs(meta) do
-        local entry = ""
-        entry = entry .. string.char(#name) .. name
-        entry = entry .. string.char(m.owner, m.group, m.perms)
-        entry = entry .. string.char(#m.cmeta) .. m.cmeta
-        file = file .. entry
-    end
-    return file
-end
-
--- Get file metadata object
-local function getFileMeta(path)
-    local disk, fullPath = resolvePath(path)
-    fullPath = normalizePath(fullPath)
-
-    local parts = {}
-    for p in fullPath:gmatch("[^/]+") do table.insert(parts, p) end
-
-    -- default fallback
-    local default = {owner = 0, group = 0, perms = 63, cmeta = ""}
-
-    -- walk from deepest parent upward
-    for i = #parts, 1, -1 do
-        local parent = "/" .. table.concat(parts, "/", 1, i - 1)
-        if parent ~= "/" then parent = parent .. "/" end
-
-        local target = parts[i]
-        if target == ".meta" then error("Cannot open metafile") end
-        local metaPath = parent .. ".meta"
-
-        if disk:fileExists(metaPath) then
-            local f = disk:open(metaPath, "r")
-            local text = f.read(65535)
-            f.close()
-
-            local parsed = parseMetafile(text)
-            if parsed[target] then return parsed[target] end
-        end
-    end
-
-    return default
-end
-
-local function ensureParentMeta(path)
-    local disk, fullPath = resolvePath(path)
-    fullPath = normalizePath(fullPath)
-
-    -- split parent + name
-    local parent, name = fullPath:match("^(.*)/([^/]+)$")
-    if not parent then
-        parent = "/"
-        name = fullPath:gsub("^/", "")
-    end
-
-    if name == ".meta" then error("Cannot open metafile") end
-
-    if parent ~= "/" and parent:sub(-1) ~= "/" then parent = parent .. "/" end
-
-    local metaPath = parent .. ".meta"
-
-    if not disk:fileExists(metaPath) then
-        local f = disk:open(metaPath, "w")
-        f.write("")
-        f.close()
-    end
-
-    return metaPath, name
-end
-
--- Permission checking
-local function checkperms(meta, mode)
-    local modes = {
-        r = {owner = 5, group = 3, everyone = 1},
-        w = {owner = 4, group = 2, everyone = 0},
-        a = {owner = 4, group = 2, everyone = 0}
-    }
-
-    local bits = meta.perms
-    local function bit_is_set(num, bit)
-        return math.floor(num / (2 ^ bit)) % 2 == 1
-    end
-
-    if kernel.uid == 0 then return true end
-    if kernel.uid == meta.owner and bit_is_set(bits, modes[mode].owner) then
-        return true
-    end
-
-    if meta.group and kernel.groups then
-        for _, gid in ipairs(kernel.groups) do
-            if gid == meta.group and bit_is_set(bits, modes[mode].group) then
-                return true
-            end
-        end
-    end
-
-    if bit_is_set(bits, modes[mode].everyone) then return true end
-    error("EACCES")
-end
-
--- mounts
-local function normalizeMountPoint(path)
-    path = normalizePath(path)
-    if path ~= "/" and path:sub(-1) == "/" then path = path:sub(1, -2) end
-    return path
-end
-
-local required = {
-    "open",
-    "type",
-    "list",
-    "attributes",
-    "fileExists",
-    "makeDirectory",
-    "remove"
-}
-
-local function check(disk)
-    for _, name in ipairs(required) do
-        if type(disk[name]) ~= "function" then
-            error("Invalid disk: missing method '" .. name .. "'")
-        end
-    end
-end
-
-function vfs.mount(target, diskOrId)
-    if kernel.uid ~= 0 then error("EPERM") end
-    if not target then error("EINVAL") end
-
-    target = normalizeMountPoint(target)
-    if not vfs.exists(target) then vfs.mkdir(target) end
-    if vfs.type(target) ~= "directory" then error("EINVAL") end
-
-    local disk
-    local id
-
-    if type(diskOrId) == "string" then
-        disk = kernel.disks[diskOrId]
-        if not disk then error("ENODEV") end
-        check(disk)
-        id = diskOrId
-    elseif type(diskOrId) == "table" then
-        check(disk)
-        disk = diskOrId
-        id = disk.address
-        vfs.disks[id] = disk
-    else
-        error("EINVAL")
-    end
-
-    -- Prevent shadowing an existing mount
-    for _, mp in pairs(vfs.mounts) do if mp == target then error("EBUSY") end end
-
-    vfs.mounts[id] = target
-    return true
-end
-
-function vfs.umount(target)
-    if kernel.uid ~= 0 then error("EPERM") end
-    if not target then error("EINVAL") end
-
-    target = normalizeMountPoint(target)
-
-    for id, mp in pairs(vfs.mounts) do
-        if mp == target then
-            if id == "$" then error("EBUSY") end -- root fs
-            vfs.mounts[id] = nil
-            return true
-        end
-    end
-
-    error("EINVAL")
-end
-
--- Open file
-function vfs.open(path, mode)
-    checkSystemLimit()
-    local task = kernel.currentTask
-    local fd = allocFD(task)
-    local disk, diskPath = resolvePath(path)
-    if not disk then error("NODISK") end
-
-    local meta = getFileMeta(path)
-    checkperms(meta, mode)
-
-    local handle
-    if disk:type(diskPath)~="directory" then
-        handle = disk:open(diskPath, mode)
-        if type(handle)~="table" then error("ENFILE") end
-    end
-
-    task.fd[fd] = newFileObj(handle, mode, path, meta, disk:type(diskPath))
-    if not disk.isvirt then
-        total = total + 1
-    end
-    return fd
-end
-
--- Read
-function vfs.read(fd, count)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    if not file.handle.read then error("EBADF") end
-    return file.handle.read(count or 1) or ""
-end
-
--- Write
-function vfs.write(fd, content)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    if not file.handle.write then error("EBADF") end
-    return file.handle.write(content)
-end
-
--- Pread / Pwrite
-function vfs.pread(fd, count, offset)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    if not file.handle.read then error("EBADF") end
-    if not file.handle.seek then error("EBADF") end
-    file.handle.seek("set", offset)
-    return file.handle.read(count or 1) or ""
-end
-
-function vfs.pwrite(fd, content, offset)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    if not file.handle.write then error("EBADF") end
-    if not file.handle.seek then error("EBADF") end
-    file.handle.seek("set", offset)
-    return file.handle.write(content)
-end
-
--- Seek
-function vfs.lseek(fd, offset, whence)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    if not file.handle.seek then error("EBADF") end
-    return file.handle.seek(whence or "set", offset)
-end
-
--- Fsync
-function vfs.fsync(fd)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    if not file.handle.flush then error("EBADF") end
-    if file.mode ~= "w" and file.mode ~= "a" then error("EBADF") end
-    file.handle.flush()
-end
-
--- Close
-function vfs.close(fd)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-
-    task.fd[fd] = nil
-    total = total - 1
-
-    file.refcount = file.refcount - 1
-    if file.refcount <= 0 then
-        if file.handle.close then
-            file.handle.close()
-        end
-    end
-end
-
--- Sendfile
-function vfs.sendfile(outfd, infd, count)
-    local task = kernel.currentTask
-    local inFile = task.fd[infd]
-    local outFile = task.fd[outfd]
-    if not inFile or not outFile then error("EBADF") end
-    if not inFile.handle.read then error("EBADF") end
-    if not outFile.handle.write then error("EBADF") end
-    local data = inFile.handle.read(count or 1024)
-    if not data or data == "" then return end
-    return outFile.handle.write(data)
-end
-
--- Stat / Fstat
-function vfs.stat(path)
-    local disk, diskPath = resolvePath(path)
-    local meta = getFileMeta(path)
-    local attrs = disk:attributes(diskPath)
-    return {
-        size = attrs.size,
-        modified = attrs.modified,
-        created = attrs.created,
-        owner = meta.owner,
-        group = meta.group,
-        xattr = meta.cmeta
-    }
-end
-
-function vfs.fstat(fd)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    local disk, path = resolvePath(file.path)
-    local attrs = disk:attributes(path)
-    return {
-        size = attrs.size,
-        modified = attrs.modified,
-        created = attrs.created,
-        owner = file.meta.owner,
-        group = file.meta.group,
-        xattr = file.meta.cmeta
-    }
-end
-
--- Directory operations
-function vfs.listdir(path)
-    local disk, diskPath = resolvePath(path)
-    if disk:type(diskPath) ~= "directory" then error("ENOENT") end
-    local meta = getFileMeta(path)
-    checkperms(meta, "r")
-    local list = disk:list(diskPath)
-    if table.indexOf(list, ".meta") ~= -1 then
-        table.remove(list, table.indexOf(list, ".meta"))
-    end
-    return list
-end
-
-function vfs.mkdir(path)
-    local disk, diskPath = resolvePath(path)
-    local meta = getFileMeta(path)
-    checkperms(meta, "w")
-    disk:makeDirectory(diskPath)
-end
-
-function vfs.remove(path)
-    local disk, diskPath = resolvePath(path)
-    local meta = getFileMeta(path)
-    checkperms(meta, "w")
-    disk:remove(diskPath)
-end
-
--- Permission functions
-function vfs.chmod(path, perms)
-    local disk, diskPath = resolvePath(path)
-    local meta = getFileMeta(path)
-
-    if meta.owner ~= kernel.currentTask.uid then error("EACCES") end
-    meta.perms = perms
-
-    local mpath, target = ensureParentMeta(path)
-
-    local mf = disk:open(mpath, "r")
-    local text = mf.read(65535)
-    mf.close()
-
-    local parsed = parseMetafile(text)
-    parsed[target] = meta
-
-    local f = disk:open(mpath, "w")
-    f.write(makeMetafile(parsed))
-    f.close()
-end
-
-function vfs.fchmod(fd, perms)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    vfs.chmod(file.path, perms)
-end
-
-function vfs.chown(path, uid, gid)
-    local disk, diskPath = resolvePath(path)
-    local meta = getFileMeta(path)
-
-    if meta.owner ~= kernel.currentTask.uid then error("EACCES") end
-    meta.owner = uid
-    meta.group = gid
-
-    local mpath, target = ensureParentMeta(path)
-
-    local mf = disk:open(mpath, "r")
-    local text = mf.read(65535)
-    mf.close()
-
-    local parsed = parseMetafile(text)
-    parsed[target] = meta
-
-    local f = disk:open(mpath, "w")
-    f.write(makeMetafile(parsed))
-    f.close()
-end
-
-function vfs.fchown(fd, uid, gid)
-    local task = kernel.currentTask
-    local file = task.fd[fd]
-    if not file then error("EBADF") end
-    vfs.chown(file.path, uid, gid)
-end
-
-function vfs.exists(path)
-    local disk, diskPath = resolvePath(path)
-    local meta = getFileMeta(path)
-    checkperms(meta, "r")
-    return disk:fileExists(diskPath)
-end
-
-function vfs.type(path)
-    local disk, diskPath = resolvePath(path)
-    local meta = getFileMeta(path)
-    checkperms(meta, "r")
-    return disk:type(diskPath)
-end
-
-function vfs.getcwd() return kernel.currentTask.cwd end
-
-function vfs.chdir(path) kernel.currentTask.cwd = path end
-
-function vfs.dup(oldfd)
-    local task = kernel.currentTask
-    local file = task.fd[oldfd]
-    if not file then error("EBADF") end
-
-    checkSystemLimit()
-
-    local newfd = allocFD(task)
-    file.refcount = file.refcount + 1
-    task.fd[newfd] = file
-    total = total + 1
-
-    return newfd
-end
-
-function vfs.dup2(oldfd, newfd)
-    local task = kernel.currentTask
-    local file = task.fd[oldfd]
-    if not file then error("EBADF") end
-    if newfd < 0 or newfd >= kernel.config.maxFilesPerTask then
-        error("EBADF")
-    end
-
-    if oldfd == newfd then
-        return newfd
-    end
-
-    if task.fd[newfd] then
-        vfs.close(newfd)
-    end
-
-    checkSystemLimit()
-
-    file.refcount = file.refcount + 1
-    task.fd[newfd] = file
-    total = total + 1
-
-    return newfd
-end
-
-function vfs.devctl(fd, method, ...)
-    if not kernel.currentTask.fd[fd] then error("EBADF") end
-    if not kernel.currentTask.fd[fd].handle[method] then error("EINVAL") end
-    return kernel.currentTask.fd[fd].handle[method](...)
-end
-
--- Export syscalls
-local sys = kernel.syscalls
-sys["open"] = vfs.open
-sys["close"] = vfs.close
-sys["read"] = vfs.read
-sys["write"] = vfs.write
-sys["pread"] = vfs.pread
-sys["pwrite"] = vfs.pwrite
-sys["lseek"] = vfs.lseek
-sys["fsync"] = vfs.fsync
-sys["sendfile"] = vfs.sendfile
-sys["stat"] = vfs.stat
-sys["fstat"] = vfs.fstat
-sys["mkdir"] = vfs.mkdir
-sys["remove"] = vfs.remove
-sys["listdir"] = vfs.listdir
-sys["chmod"] = vfs.chmod
-sys["fchmod"] = vfs.fchmod
-sys["chown"] = vfs.chown
-sys["fchown"] = vfs.fchown
-sys["exists"] = vfs.exists
-sys["type"] = vfs.type
-sys["mount"] = vfs.mount
-sys["umount"] = vfs.umount
-sys["getcwd"] = vfs.getcwd
-sys["chdir"] = vfs.chdir
-sys["dup"] = vfs.dup
-sys["dup2"] = vfs.dup2
-sys["devctl"] = vfs.devctl
-
-kernel.log("VFS module loaded")

Src/Hyperion-kernel/lib/modules/Hyperion/14_keventd.kmod

@@ -1,22 +0,0 @@
----- :Minify:--
---local kernel = ...
---
---local timeout = false
---kernel.processes.keventd = function()
---    while true do
---        local event = {kernel.computer:getMachineEvent()}
---        if event[1] then
---            if event[1] == "keyTyped" then
---                if event[3] == "\x1b^s" then
---                    kernel.shutdown()
---                elseif event[3] == "\x1b^r" then
---                    kernel.reboot()
---                end
---            end
---            timeout = false
---        else
---            timeout = true
---        end
---        if timeout then sleep(.05) end
---    end
---end

Src/Hyperion-kernel/lib/modules/Hyperion/20_socket.kmod

@@ -1,14 +0,0 @@
---:Minify:--
-local kernel = ...
-local socket = {}
-
-function socket.socket()
-    
-end
-
-function socket.bind()
-    
-end
-
-kernel.socket=socket
-kernel.log("Loaded socket module")

Src/Hyperion-kernel/lib/modules/Hyperion/26_tty.kmod

@@ -1,6 +0,0 @@
---:Minify:--
-local kernel=...
-kernel.vfs.open("/dev/null", "r")
-kernel.vfs.open("/dev/tty/TTY1", "w")
-kernel.vfs.open("/dev/null", "w")
-kernel.status="term"

Src/Hyperion-kernel/lib/modules/Hyperion/45_hypervisor.kmod

@@ -1,438 +0,0 @@
--- :Minify:--
-local kernel = ...
-local tasks = {}
-local sys = {}
-local nextpid = 2
-kernel.exitMain = false
-
-function sys.spawn(func, name, envars, args, tgid)
-    local id = nextpid
-    nextpid = nextpid + 1
-
-    tasks[tostring(id)] = {
-        coro = coroutine.create(function()
-            local ok, err = xpcall(func, debug.traceback, table.unpack(args or {}))
-            if not ok then
-                if kernel.config.logTaskExit then
-                    kernel.log(
-                        "Task " .. tostring(id) .. " exited with err: " ..
-                            tostring(err), "ERROR", 2)
-                end
-
-                if type(err) == "number" then
-                    tasks[tostring(id)].exit = err
-                end
-            else
-                if kernel.config.logTaskExit then
-                    if err then
-                        kernel.log("Task " .. tostring(id) ..
-                                       " exited with code: " .. tostring(err),
-                                   "INFO")
-                    else
-                        kernel.log("Task " .. tostring(id) ..
-                                       " exited without code", "INFO")
-                    end
-                end
-                
-                if type(err) == "number" then
-                    tasks[tostring(id)].exit = err
-                end
-            end
-            for v, _ in ipairs(tasks[tostring(id)].fd) do pcall(kernel.vfs.close,v) end
-            tasks[tostring(id)].status = "Z"
-
-        end),
-        name = name or ("task" .. tostring(id)),
-        envars = envars or kernel.currentTask.envars,
-        args = args or {},
-        status = "R",
-        pid = id,
-        tgid = tgid or kernel.currentTask.tgid,
-        uid = kernel.uid,
-        fd = {},
-        sleep = 0,
-        ivs = 0,
-        vs = 0,
-        children = {},
-        parent = kernel.currentTask,
-        siblings = kernel.currentTask.children,
-        syscallReturn = {},
-        cwd = kernel.currentTask.cwd,
-        timeSlice = 0,
-        lastTime = 0,
-        totalTime = 0,
-        numRuns = 0
-    }
-
-    table.insert(kernel.currentTask.children, tasks[tostring(id)])
-    return id
-end
-
-function sys.sleep(s)
-    kernel.currentTask.status = "S"
-    kernel.currentTask.sleep = kernel.computer:time() + s * 1000
-    coroutine.yield()
-end
-
-function sys.getTask(pid)
-    if tasks[tostring(pid)] then
-        local task = tasks[tostring(pid)]
-        local children = {}
-        local siblings = {}
-
-        for i, v in ipairs(task.children) do children[i] = v.pid end
-        for i, v in ipairs(task.siblings) do siblings[i] = v.pid end
-
-        return {
-            name = task.name,
-            status = task.status,
-            pid = task.pid,
-            tgid = task.tgid,
-            username = kernel.users[task.uid],
-            uid = task.uid,
-            exit = task.exit,
-            sleep = task.sleep,
-            ivs = task.ivs,
-            vs = task.vs,
-            children = children,
-            siblings = siblings,
-            parent = task.parent.pid,
-            cwd = task.cwd,
-            term = task.term
-        }
-    end
-end
-
-function sys.collect(pid)
-    local children = {}
-    for i, v in ipairs(kernel.currentTask.children) do children[i] = v.pid end
-
-    if not tasks[tostring(pid)] then
-        return false, "Task does not exist"
-
-    elseif not isEqualToAny(tasks[tostring(pid)].pid, table.unpack(children)) then
-        return false, "You do not own this task"
-
-    elseif tasks[tostring(pid)].status ~= "Z" then
-        return false, "Task must exit to collect status"
-
-    else
-        tasks[tostring(pid)].reapTime = 0
-        return true, tasks[tostring(pid)].exit
-    end
-end
-
-function sys.kill(pid)
-    local children = {}
-    for i, v in ipairs(kernel.currentTask.children) do children[i] = v.pid end
-
-    if not tasks[tostring(pid)] then
-        return false, "Task does not exist"
-
-    elseif tasks[tostring(pid)].status == "Z" then
-        return false, "Task is already dead"
-
-    else
-        tasks[tostring(pid)].status = "Z"
-        return true
-    end
-end
-
-function sys.stop(pid)
-    local children = {}
-    for i, v in ipairs(kernel.currentTask.children) do children[i] = v.pid end
-
-    if not tasks[tostring(pid)] then
-        return false, "Task does not exist"
-
-    elseif tasks[tostring(pid)].status ~= "R" then
-        return false, "Cannot stop non running task"
-
-    else
-        tasks[tostring(pid)].status = "T"
-        return true
-    end
-end
-
-function sys.continue(pid)
-    local children = {}
-    for i, v in ipairs(kernel.currentTask.children) do children[i] = v.pid end
-    if not tasks[tostring(pid)] then
-        return false, "Task does not exist"
-
-    elseif tasks[tostring(pid)].status ~= "T" then
-        return false, "Task is not stopped"
-
-    else
-        tasks[tostring(pid)].status = "R"
-        return true
-    end
-end
-
-function sys.getpid() return kernel.currentTask.pid end
-
-function sys.getppid() return kernel.currentTask.parent.pid end
-
-function sys.getTasks()
-    local ret = {}
-    for i, v in pairs(tasks) do ret[#ret + 1] = v.pid end
-    return ret
-end
-
-function sys.getEnviron(key) return kernel.currentTask.envars[key] end
-
-function sys.setEnviron(key, value) kernel.currentTask.envars[key] = value end
-
-function sys.exit(code)
-    if kernel.config.logTaskExit then
-        if code then
-            kernel.log("Task " .. tostring(kernel.currentTask.pid) .. " exited with code: " .. tostring(code), "INFO")
-        else
-            kernel.log("Task " .. tostring(kernel.currentTask.pid) .. " exited without code", "INFO")
-        end
-    end
-
-    tasks[tostring(kernel.currentTask.pid)].status = "Z"
-    if type(code) == "number" then
-        tasks[tostring(kernel.currentTask.pid)].exit = code
-    end
-end
-
-function sys.setuid(uid)
-    if kernel.uid ~= 0 then error("EACCES") end
-    kernel.currentTask.uid = uid
-end
-
-function sys.getuid() return kernel.currentTask.uid end
-
-local sysc = kernel.syscalls
-sysc["spawn"] = sys.spawn
-sysc["sleep"] = sys.sleep
-sysc["getTask"] = sys.getTask
-sysc["collect"] = sys.collect
-sysc["kill"] = sys.kill
-sysc["stop"] = sys.stop
-sysc["continue"] = sys.continue
-sysc["getpid"] = sys.getpid
-sysc["getppid"] = sys.getppid
-sysc["getTasks"] = sys.getTasks
-sysc["setEnviron"] = sys.setEnviron
-sysc["getEnviron"] = sys.getEnviron
-sysc["exit"] = sys.exit
-sysc["setuid"] = sys.setuid
-sysc["getuid"] = sys.getuid
-kernel._G.sleep = function(...) coroutine.yield("syscall", "sleep", ...) end
-
-local function reapDeadTasks()
-    for pid, task in pairs(tasks) do
-        if task.status == "Z" and not task.reapTime then
-            kernel.currentTask = task
-            kernel.uid = task.uid
-            kernel.process = task.name
-            task.coro = nil
-            task.ivs = nil
-            task.vs = nil
-            task.args = nil
-            task.envars = nil
-            task.cwd = nil
-            task.numRuns = nil
-            task.totalTime = nil
-            task.lastTime = nil
-            task.timeSlice = nil
-            task.syscallReturn = nil
-            task.sleep = nil
-            task.fd = nil
-            task.reapTime = kernel.computer:time() + 30000
-
-        elseif task.reapTime and kernel.computer:time() > task.reapTime and
-            task.status == "Z" then
-            for _, child in ipairs(task.children) do
-                child.parent = tasks["1"]
-                child.siblings = tasks["1"].children
-                table.insert(tasks["1"].children, child)
-            end
-
-            for i, sibling in ipairs(task.siblings) do
-                if sibling.pid == task.pid then
-                    table.remove(task.siblings, i)
-                    break
-                end
-            end
-
-            tasks[pid] = nil
-        end
-    end
-end
-
-local alpha = 0.85
-local C_target = 0.01
-local Tmin = 0.0005
-local Tmax = 0.5
-local lambda_budget = 0.08
-local lambda_clamp = 0.03
-local lambda_var = 0.02
-local k_min = 0.5
-local k_max = 0.5
-local B = 0.01
-
-function kernel.main()
-    while not kernel.exitMain do
-        local N = 0
-        local Tmin_hit = 0
-        local Tmax_hit = 0
-        local totalTaskTime = 0
-        local taskTimes = {}
-
-        for pid, task in pairs(tasks) do
-            if task.status == "S" then
-                if kernel.computer:time() >= task.sleep then
-                    task.status = "R"
-                    task.sleep = 0
-                end
-            end
-            if task.status == "R" then
-                kernel.currentTask = task
-                kernel.uid = task.uid
-                kernel.process = task.name
-                N = N + 1
-
-                -- assign adaptive time slice
-                task.timeSlice = math.min(Tmax, math.max(Tmin, B / (N ^ alpha)))
-
-                if task.sigq and #task.sigq~=0 and task.sigh then
-                    local coro = coroutine.create(task.sigh)
-                    if kernel.config.preempt then
-                        coroutine.resumeWithTimeout(coro, task.timeSlice, table.remove(task.sigq, 1))
-                    else
-                        coroutine.resume(coro, table.remove(task.sigq, 1))
-                    end
-                end
-
-                -- check for exit/stop
-                if task.status=="R" then
-                    -- measure execution time
-                    local startTime = kernel.computer:time()
-                    local ret
-                    if kernel.config.preempt then
-                        ret = {
-                            coroutine.resumeWithTimeout(
-                                task.coro,
-                                task.timeSlice,
-                                table.unpack(task.syscallReturn)
-                            )
-                        }
-                    else
-                        ret = {
-                            coroutine.resume(
-                                task.coro,
-                                table.unpack(task.syscallReturn)
-                            )
-                        }
-                    end
-
-                    local elapsed = kernel.computer:time() - startTime
-                    task.lastTime = elapsed
-                    task.totalTime = (task.totalTime or 0) + elapsed
-                    task.numRuns = (task.numRuns or 0) + 1
-
-                    taskTimes[#taskTimes + 1] = elapsed
-                    totalTaskTime = totalTaskTime + elapsed
-
-                    if elapsed <= Tmin then Tmin_hit = Tmin_hit + 1 end
-                    if elapsed >= Tmax then Tmax_hit = Tmax_hit + 1 end
-
-                    -- handle task results
-                    if ret[1] == "error" or ret[1] == false then
-                        kernel.log("processHandlerException: " .. ret[2], "ERROR", 2)
-                        task.status = "Z"
-                        task.exit = "processHandlerException: " .. ret[2]
-
-                    elseif ret[1] == "timeout" then
-                        task.ivs = task.ivs + 1
-                        task.syscallReturn = {}
-
-                    elseif ret[1] == "success" or ret[1] == true then
-                        task.vs = task.vs + 1
-
-                        if ret[2] == "syscall" then
-                            if kernel.syscalls[ret[3]] then
-                                if kernel.config.debugSyscalls then
-                                    kernel.log("Task " .. task.pid .. " invoking syscall: " .. ret[3], "DBUG", 5)
-
-                                    for i = 4, #ret do
-                                        kernel.log("  inval[" .. tostring(i - 3) .. "] = " .. tostring(ret[i]), "DBUG", 5)
-                                    end
-                                end
-
-                                local sysret = {
-                                    xpcall(kernel.syscalls[ret[3]], debug.traceback, table.unpack(ret, 4))
-                                }
-
-                                if kernel.config.debugSyscalls then
-                                    if not sysret[1] then
-                                        kernel.log(
-                                            "Task " .. task.pid .. " syscall " .. ret[3] .. " failed: " .. tostring(sysret[2]), "ERROR", 2
-                                        )
-
-                                    else
-                                        kernel.log(
-                                            "Task " .. task.pid .. " syscall " .. ret[3] .. " completed returning " .. tostring(#sysret - 1) .. " values", "DBUG", 5
-                                        )
-
-                                        for i = 2, #sysret do
-                                            if type(sysret[i]) == "table" then
-                                                kernel.log(
-                                                    "  retval[" .. tostring(i - 1) .. "] = " .. table.serialize(sysret[i]),"DBUG", 5
-                                                )
-
-                                            else
-                                                kernel.log(
-                                                    "  retval[" .. tostring(i - 1) .. "] = " .. tostring(sysret[i]), "DBUG", 5
-                                                )
-                                            end
-                                        end
-                                    end
-                                end
-
-                                if not sysret[1] then
-                                    task.syscallReturn = {false, sysret[2]}
-
-                                else
-                                    task.syscallReturn = {
-                                        true, table.unpack(sysret, 2)
-                                    }
-                                end
-                            else
-                                task.syscallReturn = {
-                                    false, "Unknown syscall: " .. tostring(ret[3])
-                                }
-                            end
-                        end
-                    end
-                end
-            end
-        end
-
-        local T_prev_avg = (N > 0) and (totalTaskTime / N) or 0
-        local T_prev_var = 0
-        
-        for _, t in ipairs(taskTimes) do
-            T_prev_var = T_prev_var + (t - T_prev_avg) ^ 2
-        end
-        if N > 0 then T_prev_var = T_prev_var / N end
-
-        if N > 0 then
-            local f_clamp = k_min * (Tmin_hit / N) - k_max * (Tmax_hit / N)
-            local B_budget = (C_target * (N ^ (alpha - 1))) /
-                                 math.max(T_prev_avg, 1e-8)
-            B = B + lambda_budget * (B_budget - B) + lambda_clamp * f_clamp -
-                    lambda_var * T_prev_var
-        end
-
-        -- clean up dead tasks
-        reapDeadTasks()
-    end
-end
-
-kernel.tasks = tasks
-kernel.hpv = sys

Src/Hyperion-kernel/lib/modules/Hyperion/91_login.kmod

@@ -1,16 +0,0 @@
---:Minify:--
-local kernel = ...
-
--- It runs at uid 0 so it can call setuid() to drop privileges to the logged in user
-kernel.processes.login = function()
-    local handle = kernel.vfs.open("/bin/login", "r")
-    local text = kernel.vfs.read(handle, 1024 * 1024)
-    kernel.vfs.close(handle)
-
-    local fn, err = load(text, "@/bin/login", "t", kernel._U)
-    if not fn then
-        kernel.log("Failed to load /bin/login: " .. tostring(err), "ERROR", 2)
-        return
-    end
-    fn()
-end

Src/Hyperion-kernel/lib/modules/Hyperion/92_permissions.kmod

@@ -1,165 +0,0 @@
---:Minify:--
-local kernel = ...
-
-local bit32 = require("bit32")
-local bor = bit32.bor
-local lshift = bit32.lshift
-
---   bit 0 = everyone-write,  bit 1 = everyone-read
---   bit 2 = group-write,     bit 3 = group-read
---   bit 4 = owner-write,     bit 5 = owner-read
---   bit 6 = suid
-local P_OWNER_R = lshift(1, 5)
-local P_OWNER_W = lshift(1, 4)
-local P_GROUP_R = lshift(1, 3)
-local P_GROUP_W = lshift(1, 2)
-local P_WORLD_R = lshift(1, 1)
-local P_WORLD_W = lshift(1, 0)
-local P_SUID    = lshift(1, 6)
-
-local RW_R_R   = bor(P_OWNER_R, P_OWNER_W, P_GROUP_R, P_WORLD_R)         -- 644 / rw-r--r--
-local RWX_R_R  = bor(P_OWNER_R, P_OWNER_W, P_GROUP_R, P_WORLD_R)         -- 755 / rwxr--r--
-local RW_R__   = bor(P_OWNER_R, P_OWNER_W, P_GROUP_R)                    -- 640 / rw-r-----
-local RW____   = bor(P_OWNER_R, P_OWNER_W)                               -- 600 / rw-------
-local SUID_755 = bor(P_SUID, P_OWNER_R, P_OWNER_W, P_GROUP_R, P_WORLD_R) -- 4755
-
-local function metaEntry(name, owner, group, perms)
-    return string.char(#name) .. name
-        .. string.char(owner, group, perms)
-        .. string.char(0)
-end
-
-local rootDisk = kernel.disks["$"]
-
-local function writeMeta(dir, entries)
-    local diskDir = dir == "/" and "/" or dir
-    local path = (diskDir:sub(-1) == "/" and diskDir or diskDir .. "/") .. ".meta"
-    if path:sub(1,1) == "/" then path = path:sub(2) end
-    if path == "" then path = ".meta" end
-
-    local data = ""
-    for _, e in ipairs(entries) do
-        data = data .. metaEntry(e[1], e[2], e[3], e[4])
-    end
-
-    local ok, err = pcall(function()
-        local f = rootDisk:open(path, "w")
-        f.write(data)
-        f.close()
-    end)
-    if not ok then
-        kernel.log("permissions: failed to write /" .. path .. ": " .. tostring(err), "WARN", 8)
-    end
-end
-
-if rootDisk:fileExists(".meta") then
-    kernel.log("Permissions already seeded, skipping.", "INFO")
-else
-    kernel.log("Seeding filesystem permissions...", "INFO")
-
-    writeMeta("/", {
-        {"bin",     0, 0, RWX_R_R},
-        {"boot",    0, 0, RWX_R_R},
-        {"dev",     0, 0, RWX_R_R},
-        {"etc",     0, 0, RWX_R_R},
-        {"home",    0, 0, RWX_R_R},
-        {"lib",     0, 0, RWX_R_R},
-        {"root",    0, 0, RW____  },
-        {"sbin",    0, 0, RWX_R_R},
-        {"tmp",     0, 0, bor(P_OWNER_R, P_OWNER_W, P_GROUP_R, P_GROUP_W, P_WORLD_R, P_WORLD_W)},
-        {"usr",     0, 0, RWX_R_R},
-        {"var",     0, 0, RWX_R_R},
-    })
-
-    writeMeta("/bin", {
-        {"cat",     0, 0, RWX_R_R},
-        {"clear",   0, 0, RWX_R_R},
-        {"echo",    0, 0, RWX_R_R},
-        {"hfetch",  0, 0, RWX_R_R},
-        {"hysh",    0, 0, RWX_R_R},
-        {"hyshex",  0, 0, RWX_R_R},
-        {"install", 0, 0, RWX_R_R},
-        {"login",   0, 0, SUID_755},
-        {"ls",      0, 0, RWX_R_R},
-        {"lua",     0, 0, RWX_R_R},
-        {"luaold",  0, 0, RWX_R_R},
-        {"mkdir",   0, 0, RWX_R_R},
-        {"ps",      0, 0, RWX_R_R},
-        {"pwd",     0, 0, RWX_R_R},
-        {"spm",     0, 0, RWX_R_R},
-        {"su",      0, 0, SUID_755},
-        {"sudo",    0, 0, SUID_755},
-        {"sysdump", 0, 0, RWX_R_R},
-        {"whoami",  0, 0, RWX_R_R},
-        {"yes",     0, 0, RWX_R_R},
-        {"startup", 0, 0, RWX_R_R},
-    })
-
-    writeMeta("/bin/startup", {
-        {"test.lua",    0, 0, RWX_R_R},
-    })
-
-    writeMeta("/etc", {
-        {"passwd",  0, 0, RW_R_R},
-        {"shadow",  0, 0, RW____  },
-        {"pam.d",   0, 0, RWX_R_R},
-    })
-
-    writeMeta("/etc/pam.d", {
-        {"secret",  0, 0, RW____},
-    })
-
-    writeMeta("/sbin", {
-        {"init.lua", 0, 0, RWX_R_R},
-    })
-
-    writeMeta("/boot", {
-        {"kernel.lua",   0, 0, RW_R_R},
-        {"boot.cfg",     0, 0, RW_R_R},
-        {"safeboot.cfg", 0, 0, RW_R_R},
-        {"fstab",        0, 0, RW_R_R},
-        {"initfs",       0, 0, RW_R_R},
-        {"cct",          0, 0, RWX_R_R},
-        {"oc",           0, 0, RWX_R_R},
-    })
-
-    writeMeta("/lib", {
-        {"sys",     0, 0, RWX_R_R},
-        {"modules", 0, 0, RWX_R_R},
-        {"crypto",  0, 0, RWX_R_R},
-        {"store",   0, 0, RWX_R_R},
-        {"snip",    0, 0, RW_R_R},
-        {"io",      0, 0, RW_R_R},
-        {"bit32",   0, 0, RW_R_R},
-    })
-
-    kernel.log("Filesystem permissions seeded.", "INFO")
-end
-
--- TODO: move this to vfs.kmod
-local _orig_open = kernel.vfs.open
-kernel.vfs.open = function(path, mode)
-    local fd = _orig_open(path, mode)
-    if mode == "r" then
-        local task = kernel.currentTask
-        local fobj = task.fd[fd]
-        if fobj and fobj.meta then
-            local suid_set = bit32.extract(fobj.meta.perms, 6) == 1
-            if suid_set then
-                fobj.suid_owner = fobj.meta.owner
-            end
-        end
-    end
-    return fd
-end
-
-kernel.syscalls["fget_suid"] = function(fd)
-    local task = kernel.currentTask
-    local fobj = task and task.fd[fd]
-    if fobj and fobj.suid_owner then
-        return fobj.suid_owner
-    end
-    return nil
-end
-
-kernel.log("Permission module loaded.", "INFO")

Src/Hyperion-kernel/lib/modules/hyperion/01_stdlib.kmod

@@ -1,4 +1,8 @@
--- :Minify:--
+--:Minify:--
+--- @diagnostic disable: duplicate-set-field
+local kernel = ...
+kernel.allowGlobalOverwrites = true
+
 function string.hasSuffix(str, suffix)
     return string.sub(str, #suffix + 1) == suffix
 end
@@ -68,30 +72,24 @@ end
 local function serialize(tbl, seen)
     seen = seen or {}
 
-    -- If we've seen this table before, return a placeholder to prevent infinite loops
     if seen[tbl] then return '"[Circular Reference]"' end
 
-    -- Mark this table as seen
     seen[tbl] = true
 
     local output = "{"
     local first = true
 
     for i, v in pairs(tbl) do
-        -- Handle comma placement more cleanly
         if not first then output = output .. "," end
         first = false
 
-        -- Serialize Key
         if type(i) == "string" then
             output = output .. "[\"" .. i .. "\"]="
         elseif type(i) == "number" then
             output = output .. "[" .. tostring(i) .. "]="
         end
 
-        -- Serialize Value
         if type(v) == "table" then
-            -- Pass the 'seen' table down to the recursive call
             output = output .. serialize(v, seen)
         elseif type(v) == "string" then
             output = output .. "[=[" .. v .. "]=]"
@@ -175,6 +173,27 @@ function table.indexOf(t, value)
     return -1
 end
 
+function table.merge(...)
+    local args={...}
+    local out = {}
+    local outi = {}
+
+    for _,t in ipairs(args) do
+        for i,v in pairs(t) do
+            out[i]=v
+        end
+        for i,v in ipairs(t) do
+            outi[#outi+1]=v
+        end
+    end
+
+    for i,v in ipairs(outi) do
+        out[i]=v
+    end
+
+    return out
+end
+
 function string.replace(s, target, repl)
     local result = {}
     local i = 1
@@ -210,8 +229,12 @@ function toHex(num)
     return string.format("%X", num)
 end
 
-syscall = setmetatable({}, {
+local function makeSyscallProxy()
+    local backing = {}
+    return setmetatable(backing, {
         __index = function(self, name)
+            local raw = rawget(self, name)
+            if raw ~= nil then return raw end
             return function(...)
                 local res = table.pack(coroutine.yield("syscall", name, ...))
                 if res[1] then
@@ -220,7 +243,16 @@ syscall = setmetatable({}, {
                     error(res[2], 2)
                 end
             end
-    end
+        end,
-})
+        __newindex = function(self, k, v)
+            rawset(self, k, v)
+        end,
+        __metatable=false
+    })
+end
+
+syscall = makeSyscallProxy()
+
+_makeSyscallProxy = makeSyscallProxy
 
 table.serialize = serialize

Src/Hyperion-kernel/lib/modules/hyperion/11_require.kmod

@@ -1,4 +1,4 @@
--- :Minify:--
+--:Minify:--
 local kernel = ...
 local cache = {}
 kernel.searchpaths = {

Src/Hyperion-kernel/lib/modules/hyperion/12_devfs.kmod

@@ -16,7 +16,7 @@ proxy.getLabel = function() return "devfs" end
 proxy.attributes = function(path) return {
     size = 0,
     modified = 0,
-    created = 0,
+    created = 0
 } end
 
 function proxy:open(path, mode)

Src/Hyperion-kernel/lib/modules/hyperion/12_procfs.kmod

@@ -0,0 +1,265 @@
+--:Minify:--
+local kernel = ...
+
+local proxy = {}
+local data = {}
+
+proxy.address = "procfs0000"
+proxy.isvirt = true
+proxy.isReadOnly = function() return false end
+proxy.spaceUsed = function() return 0 end
+proxy.spaceTotal = function() return 0 end
+proxy.makeDirectory = function() error("EACCES") end
+proxy.remove = function() error("EACCES") end
+proxy.setLabel = function() error("EACCES") end
+proxy.getLabel = function() return "procfs" end
+proxy.attributes = function(path) return {
+    size = 0,
+    modified = 0,
+    created = 0
+} end
+
+local function buildMeta(entries, opts)
+    opts = opts or {}
+    local uid = opts.uid or 0
+    local gid = opts.gid or 0
+    local perms = opts.perms or 0x3F  -- default read/write for owner/group/world
+
+    local chunks = {}
+    table.insert(chunks, string.char(0x02))  -- version header
+
+    for path, target in pairs(entries) do
+        local name = path
+        local nameLen = #name
+        if nameLen > 255 then
+            error("Filename too long (>255 bytes): "..name)
+        end
+
+        -- Determine entry type: 0x01 = symlink if target ~= nil and target ~= ""
+        local entryType = 0x00
+        local cmeta = ""
+        if target and target ~= "" then
+            entryType = 0x01
+            cmeta = target
+        end
+        local cmetaLen = #cmeta
+        if cmetaLen > 255 then
+            error("cmeta too long (>255 bytes) for "..name)
+        end
+
+        -- Build entry as bytes
+        table.insert(chunks, string.char(nameLen))    -- name length
+        table.insert(chunks, name)                    -- name
+        table.insert(chunks, string.char(entryType))  -- entry type
+        table.insert(chunks, string.char(uid % 256, math.floor(uid/256) % 256))  -- uid
+        table.insert(chunks, string.char(gid % 256, math.floor(gid/256) % 256))  -- gid
+        table.insert(chunks, string.char(perms % 256, math.floor(perms/256) % 256)) -- perms
+        table.insert(chunks, string.char(cmetaLen))   -- cmeta length
+        if cmetaLen > 0 then
+            table.insert(chunks, cmeta)
+        end
+    end
+
+    return table.concat(chunks)
+end
+
+local function simpleFile(r,w)
+    return function(op, mode)
+        if op=="type" then
+            return "character device"
+        elseif op=="open" then
+            if mode=="r" then
+                return {
+                    read=r
+                }
+            elseif mode=="w" then
+                return {
+                    write=w
+                }
+            end
+        end
+    end
+end
+
+local function strFile(str)
+    local dat=tostring(str)
+    local pos=1
+    return simpleFile(function(amount)
+        pos=pos+amount
+        return dat:sub(pos-amount, pos)
+    end,function() error("EACCES") end)
+end
+
+local function newtaskproxy(task)
+    local files,siblings,children={},{},{}
+    if task.fd[0] then files["0"]=task.fd[0].path end
+    for i,v in ipairs(task.fd) do
+        files[tostring(i)]=tostring(v.path)
+    end
+    for i,v in ipairs(task.siblings) do
+        siblings[tostring(v.pid)]="/proc/"..tostring(v.pid)
+    end
+    for i,v in ipairs(task.children) do
+        children[tostring(v.pid)]="/proc/"..tostring(v.pid)
+    end
+    return {
+        [".meta"]=strFile(buildMeta({cwd=task.cwd,parent="/proc/"..tostring(task.parent.pid)})),
+        uid=strFile(task.uid),
+        comm=strFile(task.name),
+        fd={
+            [".meta"]=strFile(buildMeta(files))
+        },
+        siblings={
+            [".meta"]=strFile(buildMeta(siblings))
+        },
+        children={
+            [".meta"]=strFile(buildMeta(children))
+        }
+    }
+end
+
+function proxy:open(path, mode)
+    local steps = kernel.vfs.splitPath(path)
+    local step = data
+    if tonumber(steps[1]) then
+        local task=kernel.tasks[tostring(steps[1])]
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("open", mode)
+        end
+    elseif tostring(steps[1])=="self" then
+        local task=kernel.currentTask
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("open", mode)
+        end
+    else
+        for i=1, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("open", mode)
+        end
+    end
+    error("ENFILE")
+end
+
+function proxy:type(path, mode)
+    local steps = kernel.vfs.splitPath(path)
+    local step = data
+    if #steps == 0 then
+        return "directory"
+    end
+    if tonumber(steps[1]) then
+        local task=kernel.tasks[steps[1]]
+        if #steps==1 then return "directory" end
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("type", mode)
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return "directory"
+        end
+    elseif tostring(steps[1])=="self" then
+        local task=kernel.currentTask
+        if #steps==1 then return "directory" end
+        local step = newtaskproxy(task)
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("type", mode)
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return "directory"
+        end
+    else
+        for i=1, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENFILE") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "function" then
+            return step[steps[#steps]]("type", mode)
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return "directory"
+        end
+    end
+    error("ENOENT")
+end
+
+function proxy:list(path)
+    local steps = kernel.vfs.splitPath(path)
+    local step = data
+    if #steps == 0 then
+        return table.merge(table.keys(data),table.keys(kernel.tasks),{"self"})
+    end
+    if tonumber(steps[1]) then
+        local task=kernel.tasks[steps[1]]
+        local step = newtaskproxy(task)
+        if #steps==1 then return table.keys(step) end
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENOENT") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return table.keys(step[steps[#steps]])
+        end
+    elseif tostring(steps[1])=="self" then
+        local task=kernel.currentTask
+        local step = newtaskproxy(task)
+        if #steps==1 then return table.keys(step) end
+        for i=2, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENOENT") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return table.keys(step[steps[#steps]])
+        end
+    else
+        for i=1, #steps-1 do
+            local dat = step[steps[i]]
+            if type(dat) ~= "table" then error("ENOENT") end
+            step=dat
+        end
+        if type(step[steps[#steps]]) == "table" then
+            return table.keys(step[steps[#steps]])
+        end
+    end
+    error("ENOENT")
+end
+
+function proxy:fileExists(path)
+    local ok = pcall(function()
+        return self:type(path)
+    end)
+    return ok
+end
+
+data.uptime=simpleFile(function()return tostring(kernel.computer:getUptime())end,function()error("EACCES")end)
+kernel.procfs={}
+kernel.procfs.data=data
+kernel.procfs.proxy=proxy
+kernel.disks["procfs0000"]=proxy

Src/Hyperion-kernel/lib/modules/hyperion/12_tmpfs.kmod

@@ -1,3 +1,4 @@
+--:Minify:--
 local kernel = ...
 
 local proxy = {}
@@ -7,11 +8,9 @@ proxy.address = "tmpfs0000"
 proxy.isvirt = true
 proxy.isReadOnly = function() return false end
 
--- Space functions (just placeholders)
 proxy.spaceUsed = function() return 0 end
 proxy.spaceTotal = function() return 0 end
 
--- Writable operations
 proxy.makeDirectory = function(_, path)
     local steps = kernel.vfs.splitPath(path)
     local step = data
@@ -52,7 +51,6 @@ proxy.attributes = function(_, path)
     }
 end
 
--- Open files
 function proxy:open(path, mode)
     local steps = kernel.vfs.splitPath(path)
     local step = data
@@ -76,21 +74,27 @@ function proxy:open(path, mode)
                 local chunk = content:sub(pos, pos+amount-1)
                 pos = pos + #chunk
                 return chunk
-            end
+            end,
+            close = function() end,
         }
     elseif mode == "w" then
         step[filename] = ""
+        local buf = {}
         return {
             write = function(str)
-                step[filename] = str
+                buf[#buf + 1] = str
-            end
+            end,
+            close = function()
+                step[filename] = table.concat(buf)
+            end,
         }
     elseif mode == "a" then
         if type(step[filename]) ~= "string" then step[filename] = "" end
         return {
             write = function(str)
                 step[filename] = step[filename] .. str
-            end
+            end,
+            close = function() end,
         }
     else
         error("EACCES")
@@ -123,7 +127,8 @@ function proxy:list(path)
 end
 
 function proxy:fileExists(path)
-    return pcall(function() return self:type(path) end)
+    local t = self:type(path)
+    return t == "file" or t == "directory"
 end
 
 kernel.disks["tmpfs0000"] = proxy

Src/Hyperion-kernel/lib/modules/hyperion/13_loopdev.kmod

@@ -0,0 +1,540 @@
+--:Minify:--
+-- Loop device driver:
+--
+--   BIND  (directory)  - re-routes VFS calls into a host directory subtree.
+--                        Identical to the original behaviour.
+--
+--   IMAGE (*.hfs file) - mounts a Hyperion Filesystem Image.  The image is
+--                        loaded entirely into memory; reads and writes operate
+--                        on the in-memory tree, so the image file is only
+--                        touched on attach/detach.
+--
+-- BHFS v1 - Binary Hyperion Filesystem Image format:
+--
+--   File header (8 bytes):
+--     [0-3]  magic:   0x42 0x48 0x46 0x53  ("BHFS")
+--     [4]    version: 0x01
+--     [5]    flags:   bit0 = per-file deflate compression enabled
+--     [6-7]  reserved: 0x00 0x00
+--
+--   Records (repeated until END record):
+--     [0]    type:        0x01=file  0x02=dir  0x03=symlink  0xFF=end
+--     [1-4]  path_len     (uint32 LE) - byte length of the path string
+--     [5-8]  raw_size     (uint32 LE) - original uncompressed data size (0 for dirs)
+--     [9-12] stored_size  (uint32 LE) - bytes that follow in stream
+--                                       (< raw_size means deflate-compressed;
+--                                        = raw_size means stored as-is)
+--     [13 .. 13+path_len-1]           path bytes (no null terminator)
+--     [.. +stored_size]               data bytes
+--
+--     Dirs have raw_size=0, stored_size=0, zero data bytes.
+--     Symlinks store the target path as data; stored_size == raw_size (no compression).
+--
+-- Syscalls:
+--   id  = syscall.losetup(path)           attach dir OR .hfs image
+--   id  = syscall.losetup(path, true)     force image mode
+--         syscall.lodetach(id)            detach (must be unmounted first)
+--   tbl = syscall.lolist()                {id -> {path,mode}, ...}
+--   str = syscall.loimgcreate(srcdir)     serialise VFS dir -> BHFS binary string
+--         syscall.loimgwrite(str, dest)   write BHFS string to a file (binary)
+
+local kernel = ...
+
+local _deflate = nil
+local function getDeflate()
+    if _deflate == nil then
+        local ok, lib = pcall(require, "store.deflate")
+        _deflate = ok and lib or false
+    end
+    return _deflate or nil
+end
+
+local function pack32(n)
+    n = math.floor(n) % 4294967296
+    return string.char(
+        n % 256,
+        math.floor(n /       256) % 256,
+        math.floor(n /     65536) % 256,
+        math.floor(n / 16777216)  % 256
+    )
+end
+
+local function unpack32(s, i)
+    local a, b, c, d = s:byte(i, i + 3)
+    return (a or 0)
+         + (b or 0) * 256
+         + (c or 0) * 65536
+         + (d or 0) * 16777216
+end
+
+local BHFS_MAGIC        = "BHFS"
+local BHFS_VERSION      = "\001"
+local BHFS_FLAG_COMPRESS = 1
+
+local TYPE_FILE = "\001"
+local TYPE_DIR  = "\002"
+local TYPE_LINK = "\003"
+local TYPE_END  = "\255"
+
+local B64D = {}
+do
+    local a = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+    for i = 1, #a do B64D[a:sub(i, i)] = i - 1 end
+end
+
+local function b64dec(s)
+    s = s:gsub("[^A-Za-z0-9+/=]", "")
+    local t, i = {}, 1
+    while i <= #s do
+        local c1 = B64D[s:sub(i,   i  )] or 0
+        local c2 = B64D[s:sub(i+1, i+1)] or 0
+        local c3 = B64D[s:sub(i+2, i+2)] or 0
+        local c4 = B64D[s:sub(i+3, i+3)] or 0
+        local n  = c1*262144 + c2*4096 + c3*64 + c4
+        t[#t+1] = string.char(math.floor(n/65536) % 256)
+        if s:sub(i+2, i+2) ~= "=" then t[#t+1] = string.char(math.floor(n/256) % 256) end
+        if s:sub(i+3, i+3) ~= "=" then t[#t+1] = string.char(n % 256) end
+        i = i + 4
+    end
+    return table.concat(t)
+end
+
+local loopDevs = {}
+local nextLoop = 0
+
+local function makeBindDisk(id, dirPath)
+    local disk = { address = id, isvirt = false }
+    disk.isReadOnly  = function() return false end
+    disk.spaceUsed   = function() return 0 end
+    disk.spaceTotal  = function() return 0 end
+    disk.setLabel    = function() end
+    disk.getLabel    = function() return id end
+
+    local function resolveBase()
+        local mp, mid = "/", "$"
+        for id2, m in pairs(kernel.vfs.mounts) do
+            if dirPath == m or (m == "/" and dirPath:sub(1,1) == "/")
+               or dirPath:sub(1, #m+1) == m.."/" then
+                if #m > #mp then mp = m; mid = id2 end
+            end
+        end
+        return kernel.vfs.disks[mid], dirPath:sub(#mp+1)
+    end
+
+    local function dp(path)
+        local hd, base = resolveBase()
+        local b = (base == "" or base == "/") and "" or base:gsub("^/+","")
+        local p = path:gsub("^/+","")
+        local c = ((b=="") and "/"..p or "/"..b.."/"..p):gsub("//+","/")
+        local r = c:sub(2); if r == "" then r = "/" end
+        return hd, r
+    end
+
+    function disk:open(path,mode)       local h,r=dp(path); return h:open(r,mode) end
+    function disk:type(path)            local h,r=dp(path); return h:type(r) end
+    function disk:list(path)            local h,r=dp(path); return h:list(r) end
+    function disk:fileExists(path)      local h,r=dp(path); return h:fileExists(r) end
+    function disk:attributes(path)      local h,r=dp(path); return h:attributes(r) end
+    function disk:makeDirectory(path)   local h,r=dp(path); return h:makeDirectory(r) end
+    function disk:remove(path)          local h,r=dp(path); return h:remove(r) end
+    return disk
+end
+
+local function makeImageDisk(id, imageStr)
+    local root = { kind="dir", children={} }
+
+    local function getNode(path, create)
+        local parts = {}
+        for p in path:gmatch("[^/]+") do parts[#parts+1] = p end
+        local node = root
+        for i = 1, #parts do
+            local name = parts[i]
+            if not node.children then
+                if not create then return nil end
+                node.children = {}
+            end
+            if not node.children[name] then
+                if not create then return nil end
+                node.children[name] = { kind="dir", children={} }
+            end
+            node = node.children[name]
+        end
+        return node
+    end
+
+    local function ensureParent(path)
+        local par = path:match("^(.*)/[^/]+$") or ""
+        if par ~= "" then
+            local n = getNode(par, true)
+            if not n.children then n.children = {} end
+        end
+    end
+
+    if imageStr:sub(1, 4) == BHFS_MAGIC then
+        local pos = 9
+
+        while pos <= #imageStr do
+            local rtype = imageStr:sub(pos, pos)
+            pos = pos + 1
+
+            if rtype == TYPE_END then break end
+
+            local path_len    = unpack32(imageStr, pos); pos = pos + 4
+            local raw_size    = unpack32(imageStr, pos); pos = pos + 4
+            local stored_size = unpack32(imageStr, pos); pos = pos + 4
+
+            local path        = imageStr:sub(pos, pos + path_len - 1)
+            pos = pos + path_len
+
+            local stored_data = imageStr:sub(pos, pos + stored_size - 1)
+            pos = pos + stored_size
+            local data = stored_data
+            if stored_size < raw_size then
+                local deflate = getDeflate()
+                if deflate then
+                    data = deflate.decompress(stored_data) or stored_data
+                end
+            end
+
+            if rtype == TYPE_DIR then
+                if path ~= "" and path ~= "/" then
+                    ensureParent(path)
+                    local n = getNode(path, true)
+                    n.kind = "dir"; n.children = n.children or {}
+                end
+            elseif rtype == TYPE_FILE then
+                ensureParent(path)
+                local n = getNode(path, true)
+                n.kind="file"; n.data=data; n.size=#data; n.children=nil
+            elseif rtype == TYPE_LINK then
+                ensureParent(path)
+                local n = getNode(path, true)
+                n.kind="link"; n.target=data; n.children=nil
+            end
+        end
+    else
+        for line in (imageStr.."\n"):gmatch("([^\n]*)\n") do
+            if line == "END" then
+                break
+            elseif line:sub(1,4) == "DIR " then
+                local p = line:sub(5):match("^%s*(.-)%s*$")
+                if p and p ~= "" and p ~= "/" then
+                    ensureParent(p)
+                    local n = getNode(p, true)
+                    n.kind = "dir"; n.children = n.children or {}
+                end
+            elseif line:sub(1,5) == "FILE " then
+                local p, sz, body = line:sub(6):match("^(%S+)%s+(%d+)%s*(.-)%s*$")
+                if p then
+                    ensureParent(p)
+                    local data = (tonumber(sz) or 0) > 0 and b64dec(body) or ""
+                    local n = getNode(p, true)
+                    n.kind="file"; n.data=data; n.size=#data; n.children=nil
+                end
+            elseif line:sub(1,5) == "LINK " then
+                local p, tgt = line:sub(6):match("^(%S+)%s+(.+)$")
+                if p then
+                    ensureParent(p)
+                    local n = getNode(p, true)
+                    n.kind="link"; n.target=tgt; n.children=nil
+                end
+            end
+        end
+    end
+
+    local disk = { address=id, isvirt=false }
+    disk.isReadOnly = function() return false end
+    disk.spaceTotal = function() return 1024*1024*64 end
+    disk.spaceUsed  = function()
+        local tot = 0
+        local function w(n)
+            if     n.kind=="file" then tot = tot + (n.size or 0)
+            elseif n.kind=="dir"  then for _,c in pairs(n.children or {}) do w(c) end end
+        end
+        w(root); return tot
+    end
+    disk.setLabel = function() end
+    disk.getLabel = function() return id end
+
+    local function norm(path)
+        return path:gsub("^/+",""):gsub("/+$","")
+    end
+
+    function disk:type(path)
+        local p = norm(path)
+        if p == "" then return "directory" end
+        local n = getNode(p)
+        if not n then return nil end
+        if n.kind == "dir" then return "directory" end
+        return "file"
+    end
+
+    function disk:fileExists(path)
+        local p = norm(path)
+        if p == "" then return true end
+        return getNode(p) ~= nil
+    end
+
+    function disk:list(path)
+        local p    = norm(path)
+        local node = (p=="") and root or getNode(p)
+        if not node or node.kind ~= "dir" then return {} end
+        local out = {}
+        for name in pairs(node.children or {}) do out[#out+1] = name end
+        return out
+    end
+
+    function disk:attributes(path)
+        local p    = norm(path)
+        local node = (p=="") and root or getNode(p)
+        if not node then return nil end
+        return {
+            size      = node.kind=="file" and (node.size or 0) or 0,
+            isDir     = node.kind=="dir",
+            isReadOnly = false,
+            created   = 0,
+            modified  = 0,
+        }
+    end
+
+    function disk:open(path, mode)
+        local p    = norm(path)
+        local node = getNode(p)
+
+        if mode == "r" then
+            if not node or node.kind ~= "file" then error("ENOENT: "..path) end
+            local data, pos = node.data or "", 1
+            return {
+                read = function(n)
+                    if pos > #data then return nil end
+                    local chunk = data:sub(pos, pos + (n or 1) - 1)
+                    pos = pos + #chunk; return chunk
+                end,
+                readAll = function()
+                    local all = data:sub(pos); pos = #data + 1; return all
+                end,
+                readLine = function()
+                    if pos > #data then return nil end
+                    local nl = data:find("\n", pos, true)
+                    local line
+                    if nl then line=data:sub(pos, nl-1); pos=nl+1
+                    else        line=data:sub(pos);      pos=#data+1 end
+                    return line
+                end,
+                seek = function(w, o)
+                    o = o or 0
+                    if     w == "set" then pos = o + 1
+                    elseif w == "cur" then pos = pos + o
+                    elseif w == "end" then pos = #data + 1 + o end
+                    return pos - 1
+                end,
+                close = function() end,
+            }
+
+        elseif mode == "w" or mode == "a" then
+            local buf  = (mode=="a" and node and node.kind=="file")
+                         and {node.data or ""} or {}
+            local done = false
+            local function commit()
+                if done then return end; done = true
+                local data = table.concat(buf)
+                if not node then ensureParent(p); node = getNode(p, true) end
+                node.kind="file"; node.data=data; node.size=#data; node.children=nil
+            end
+            return {
+                write     = function(s) buf[#buf+1] = tostring(s) end,
+                writeLine = function(s) buf[#buf+1] = tostring(s).."\n" end,
+                flush     = function() end,
+                close     = commit,
+            }
+        else
+            error("EINVAL: unknown mode: "..tostring(mode))
+        end
+    end
+
+    function disk:makeDirectory(path)
+        local p = norm(path)
+        if p == "" then return end
+        ensureParent(p)
+        local n = getNode(p, true)
+        n.kind="dir"; n.children=n.children or {}; n.data=nil; n.size=nil
+    end
+
+    function disk:remove(path)
+        local p    = norm(path)
+        if p == "" then error("EBUSY: cannot remove root") end
+        local par  = p:match("^(.*)/[^/]+$") or ""
+        local name = p:match("([^/]+)$")
+        local pn   = (par=="") and root or getNode(par)
+        if pn and pn.children then pn.children[name] = nil end
+    end
+
+    disk._root = root
+    return disk
+end
+
+local function serializeDir(srcPath)
+    local deflate     = getDeflate()
+    local useCompress = deflate ~= nil
+
+    local flags = useCompress and BHFS_FLAG_COMPRESS or 0
+    local parts = {
+        BHFS_MAGIC,
+        BHFS_VERSION,
+        string.char(flags),
+        "\0\0",
+    }
+
+    srcPath = srcPath:gsub("/$", "")
+
+    local MIN_COMPRESS = 64
+
+    local function walk(vpath)
+        local ftype = kernel.vfs.type(vpath)
+
+        if ftype == "directory" then
+            if vpath ~= srcPath then
+                local relPath = vpath:sub(#srcPath + 1)
+                parts[#parts+1] = TYPE_DIR
+                parts[#parts+1] = pack32(#relPath)
+                parts[#parts+1] = pack32(0)
+                parts[#parts+1] = pack32(0)
+                parts[#parts+1] = relPath
+            end
+            local ok, entries = pcall(kernel.vfs.listdir, vpath)
+            if ok and entries then
+                table.sort(entries)
+                for _, name in ipairs(entries) do
+                    walk(vpath:gsub("/$","").."/"..name)
+                end
+            end
+
+        elseif ftype == "file" then
+            local relPath = vpath:sub(#srcPath + 1)
+            local ok, fd  = pcall(kernel.vfs.open, vpath, "r")
+            if ok then
+                local rawData = ""
+                local ok2, content = pcall(kernel.vfs.read, fd, 1024*1024)
+                if ok2 then rawData = content or "" end
+                pcall(kernel.vfs.close, fd)
+
+                local storedData = rawData
+                if useCompress and #rawData >= MIN_COMPRESS then
+                    local compressed = deflate.compress(rawData)
+                    if compressed and #compressed < #rawData then
+                        storedData = compressed
+                    end
+                end
+
+                parts[#parts+1] = TYPE_FILE
+                parts[#parts+1] = pack32(#relPath)
+                parts[#parts+1] = pack32(#rawData)
+                parts[#parts+1] = pack32(#storedData)
+                parts[#parts+1] = relPath
+                parts[#parts+1] = storedData
+            end
+        end
+    end
+
+    walk(srcPath)
+
+    parts[#parts+1] = TYPE_END
+
+    return table.concat(parts)
+end
+
+kernel.syscalls["losetup"] = function(filePath, forceImage)
+    if not filePath then error("EINVAL") end
+    local task = kernel.currentTask
+    local euid = (task and (task.euid or task.uid)) or kernel.uid
+    if euid ~= 0 then error("EPERM") end
+
+    filePath = filePath:gsub("/$", "")
+    local id = "loop" .. tostring(nextLoop)
+    nextLoop = nextLoop + 1
+
+    local ftype = kernel.vfs.type(filePath)
+    local disk, mode
+
+    if not forceImage and ftype == "directory" then
+        disk = makeBindDisk(id, filePath)
+        mode = "bind"
+    elseif ftype == "file" or forceImage then
+        if ftype ~= "file" then error("ENOENT: not a file: "..filePath) end
+
+        local img
+        local ok, fd = pcall(kernel.vfs.open, filePath, "rb")
+        if ok then
+            local ok2, data = pcall(kernel.vfs.read, fd, 1024*1024*16)
+            pcall(kernel.vfs.close, fd)
+            if ok2 and data then img = data end
+        end
+        if not img then
+            local ok2, fd2 = pcall(kernel.vfs.open, filePath, "r")
+            if not ok2 then error("EIO: cannot open image: "..filePath) end
+            local ok3, data = pcall(kernel.vfs.read, fd2, 1024*1024*16)
+            pcall(kernel.vfs.close, fd2)
+            if not ok3 or not data then error("EIO: cannot read image: "..filePath) end
+            img = data
+        end
+
+        disk = makeImageDisk(id, img)
+        mode = "image"
+    else
+        error("EINVAL: path must be a directory or .hfs image file")
+    end
+
+    kernel.vfs.disks[id] = disk
+    loopDevs[id] = { path=filePath, disk=disk, mode=mode }
+    kernel.log("losetup: attached "..id.." ("..mode..") -> "..filePath, "INFO")
+    return id
+end
+
+kernel.syscalls["lodetach"] = function(id)
+    local task = kernel.currentTask
+    local euid = (task and (task.euid or task.uid)) or kernel.uid
+    if euid ~= 0 then error("EPERM") end
+
+    if not loopDevs[id] then error("ENXIO") end
+    for mid in pairs(kernel.vfs.mounts) do
+        if mid == id then error("EBUSY: loop device is still mounted") end
+    end
+    kernel.vfs.disks[id] = nil
+    loopDevs[id]         = nil
+    kernel.log("lodetach: detached "..id, "INFO")
+end
+
+kernel.syscalls["lolist"] = function()
+    local rv = {}
+    for id, info in pairs(loopDevs) do
+        rv[id] = { path=info.path, mode=info.mode }
+    end
+    return rv
+end
+
+kernel.syscalls["loimgcreate"] = function(srcPath)
+    local task = kernel.currentTask
+    local euid = (task and (task.euid or task.uid)) or kernel.uid
+    if euid ~= 0 then error("EPERM") end
+    if not srcPath then error("EINVAL") end
+    if kernel.vfs.type(srcPath) ~= "directory" then error("ENOTDIR: "..srcPath) end
+    return serializeDir(srcPath)
+end
+
+kernel.syscalls["loimgwrite"] = function(imgStr, destPath)
+    local task = kernel.currentTask
+    local euid = (task and (task.euid or task.uid)) or kernel.uid
+    if euid ~= 0 then error("EPERM") end
+    if not imgStr or not destPath then error("EINVAL") end
+
+    local ok, fd = pcall(kernel.vfs.open, destPath, "wb")
+    if not ok then
+        ok, fd = pcall(kernel.vfs.open, destPath, "w")
+        if not ok then error("EIO: cannot write: "..tostring(destPath)) end
+    end
+    local ok2, werr = pcall(kernel.vfs.write, fd, imgStr)
+    pcall(kernel.vfs.close, fd)
+    if not ok2 then error("EIO: write failed: "..tostring(werr)) end
+end
+
+kernel.log("Loop device driver loaded (bind + BHFS binary image + legacy HFS compat)")

Src/Hyperion-kernel/lib/modules/hyperion/20_socket.kmod

@@ -0,0 +1,556 @@
+--:Minify:--
+-- Supports:
+--   AF_UNIX  - local IPC via /var/run/*.sock paths
+--   AF_INET  - network sockets with three backends:
+--     rednet://0.0.B.C  or  rednet+PROTO://0.0.B.C    -> CC rednet (computer B*256+C)
+--     modem://0.0.B.C                                 -> raw CC modem frames
+--     http://host/path  or  https://...               -> HTTP via CC http API
+--     A.B.C.D (dotted quad, non-zero A)               -> HTTP
+--
+-- Socket lifecycle:
+--   fd = syscall.socket(domain, socktype)   -- "unix"/"inet", "stream"/"dgram"
+--   syscall.bind(fd, address)               -- server: claim address
+--   syscall.listen(fd, backlog)             -- server: mark as listening
+--   cfd = syscall.accept(fd)                -- server: get connected client fd (blocking poll)
+--   syscall.connect(fd, address)            -- client: connect to server
+--   syscall.send(fd, data)                  -- send bytes
+--   syscall.recv(fd, len)                   -- receive bytes (blocking poll, returns "" on nothing)
+--   syscall.sockshutdown(fd)                -- half-close send side
+--   -- normal vfs.close(fd) closes the socket
+
+local kernel = ...
+
+local sockets    = {}
+local unixSocks  = {}
+local nextSockId = 1
+
+local function allocSockId()
+    local id = nextSockId
+    nextSockId = nextSockId + 1
+    return id
+end
+
+local function parseAddress(addr)
+    if not addr then error("EINVAL") end
+
+    if addr:sub(1,1) == "/" or addr:sub(1,5) == "unix:" then
+        local path = addr:sub(1,5) == "unix:" and addr:sub(6) or addr
+        return { backend="unix", path=path }
+    end
+
+    local rproto, raddr = addr:match("^rednet%+?([^:/]*)://(.+)$")
+    if raddr then
+        local a,b,c,d = raddr:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
+        if not a then error("EINVAL: bad rednet address " .. raddr) end
+        local compId = tonumber(c)*256 + tonumber(d)
+        return { backend="rednet", compId=compId,
+                 protocol=(rproto ~= "" and rproto or "hyperion") }
+    end
+
+    local maddr = addr:match("^modem://(.+)$")
+    if maddr then
+        local a,b,c,d = maddr:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
+        if not a then error("EINVAL: bad modem address " .. maddr) end
+        local compId = tonumber(c)*256 + tonumber(d)
+        local port = tonumber(maddr:match(":(%d+)$")) or 0
+        return { backend="modem", compId=compId, port=port }
+    end
+
+    local scheme, rest = addr:match("^(https?)://(.+)$")
+    if scheme then
+        return { backend=scheme, url=addr }
+    end
+
+    local a,b,c,d = addr:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)")
+    if a and tonumber(a) ~= 0 then
+        return { backend="http", url="http://" .. addr }
+    end
+
+    error("EINVAL: unrecognised address format: " .. tostring(addr))
+end
+
+local rednetOpen = false
+local function ensureRednet()
+    if rednetOpen then return end
+    local rn = kernel.apis and kernel.apis.rednet
+    if not rn then error("ENODEV: no rednet API available") end
+    local peripheral = kernel.apis.peripheral
+    if peripheral then
+        for _, name in ipairs(peripheral.getNames and peripheral.getNames() or {}) do
+            if peripheral.getType(name) == "modem" then
+                pcall(rn.open, name)
+            end
+        end
+    end
+    rednetOpen = true
+end
+
+local function getModem()
+    local peripheral = kernel.apis and kernel.apis.peripheral
+    if not peripheral then error("ENODEV") end
+    for _, name in ipairs(peripheral.getNames and peripheral.getNames() or {}) do
+        if peripheral.getType(name) == "modem" then
+            local m = peripheral.wrap(name)
+            if m then return m, name end
+        end
+    end
+    error("ENODEV: no modem peripheral found")
+end
+
+local function pumpEvents()
+    local ev = kernel.computer:getMachineEvent()
+    while ev do
+        if ev == "rednet_message" then
+            for _, sock in pairs(sockets) do
+                if sock.backend == "rednet" and sock.bound then
+                    if sock.address.protocol == tostring(select(4, table.unpack({ev}))) or
+                       sock.address.protocol == "hyperion" then
+                    end
+                end
+            end
+        end
+        ev = kernel.computer:getMachineEvent()
+    end
+end
+
+local function pollEvent()
+    local results = table.pack(kernel.computer:getMachineEvent())
+    if results.n == 0 or results[1] == nil then return nil end
+    return results
+end
+
+local function dispatchEvent(ev)
+    if not ev then return end
+    local evtype = ev[1]
+
+    if evtype == "rednet_message" then
+        local senderId = ev[2]
+        local message  = ev[3]
+        local protocol = ev[4] or "hyperion"
+        for _, sock in pairs(sockets) do
+            if sock.backend == "rednet" and (sock.listening or sock.connected) then
+                if sock.address and sock.address.protocol == protocol then
+                    table.insert(sock.rxbuf, { from=senderId, data=message })
+                end
+            end
+        end
+
+    elseif evtype == "modem_message" then
+        local channel = ev[3]
+        local msg     = ev[5]
+        local fromCh  = ev[4]
+        for _, sock in pairs(sockets) do
+            if sock.backend == "modem" and sock.modemChannel == channel then
+                table.insert(sock.rxbuf, { from=fromCh, data=msg })
+            end
+        end
+
+    elseif evtype == "http_success" then
+        local url    = ev[2]
+        local handle = ev[3]
+        for _, sock in pairs(sockets) do
+            if sock.backend == "http" or sock.backend == "https" then
+                if sock.pendingUrl == url then
+                    local body = handle.readAll and handle.readAll() or ""
+                    handle.close()
+                    table.insert(sock.rxbuf, { data=body, done=true })
+                    sock.pendingUrl = nil
+                    sock.connected  = true
+                end
+            end
+        end
+
+    elseif evtype == "http_failure" then
+        local url = ev[2]
+        local err = ev[3]
+        for _, sock in pairs(sockets) do
+            if (sock.backend == "http" or sock.backend == "https") and
+               sock.pendingUrl == url then
+                sock.error     = err
+                sock.pendingUrl = nil
+            end
+        end
+    end
+end
+
+local function pumpAll()
+    local ev = pollEvent()
+    while ev do
+        dispatchEvent(ev)
+        ev = pollEvent()
+    end
+end
+
+local function newSocket(domain, socktype)
+    local sock = {
+        id       = allocSockId(),
+        domain   = domain,    -- "unix" | "inet"
+        socktype = socktype,  -- "stream" | "dgram"
+        backend  = nil,
+        state    = "idle",    -- idle | bound | listening | connected | closed
+        rxbuf    = {},
+        txbuf    = {},
+        backlog  = {},
+        address  = nil,
+        peer     = nil,
+        modemChannel = nil,
+        modem        = nil,
+        pendingUrl = nil,
+        bound     = false,
+        listening = false,
+        connected = false,
+        error     = nil,
+    }
+    sockets[sock.id] = sock
+    return sock
+end
+
+local sockSend, sockClose
+
+local function socketToFd(sock)
+    return {
+        isSocket = true,
+        sockId   = sock.id,
+        mode     = "rw",
+        meta     = { etype=0, owner=0, group=0, perms=0x1FF, cmeta="" },
+        type     = "socket",
+        refcount = 1,
+        handle   = {
+            read = function(count)
+                pumpAll()
+                if #sock.rxbuf == 0 then return "" end
+                local item = table.remove(sock.rxbuf, 1)
+                local data = type(item) == "table" and (item.data or "") or tostring(item)
+                if count and #data > count then
+                    table.insert(sock.rxbuf, 1, { data=data:sub(count+1), from=item.from })
+                    data = data:sub(1, count)
+                end
+                return data
+            end,
+            write = function(data)
+                if sock.state == "closed" then error("EBADF") end
+                return sockSend(sock, data)
+            end,
+            close = function()
+                sockClose(sock)
+            end,
+        }
+    }
+end
+
+sockSend = function(sock, data)
+    if sock.backend == "unix" then
+        local peer = sock.peer
+        if not peer then error("ENOTCONN") end
+        table.insert(peer.rxbuf, { data=data })
+        return #data
+
+    elseif sock.backend == "rednet" then
+        ensureRednet()
+        local rn = kernel.apis.rednet
+        rn.send(sock.address.compId, data, sock.address.protocol)
+        return #data
+
+    elseif sock.backend == "modem" then
+        local modem = sock.modem
+        if not modem then error("ENOTCONN") end
+        modem.transmit(sock.address.port, sock.modemChannel or 0, data)
+        return #data
+
+    elseif sock.backend == "http" or sock.backend == "https" then
+        local http = kernel.apis and kernel.apis.http
+        if not http then error("ENODEV: no http API") end
+        local url = sock.address.url
+        local ok, err = pcall(http.request, url, data, {
+            ["Content-Type"] = "application/octet-stream"
+        })
+        if not ok then error("ENETDOWN: " .. tostring(err)) end
+        sock.pendingUrl = url
+        return #data
+    end
+    error("EPROTONOSUPPORT")
+end
+
+sockClose = function(sock)
+    if sock.state == "closed" then return end
+    sock.state = "closed"
+
+    if sock.backend == "unix" then
+        if sock.peer then
+            sock.peer.peer  = nil
+            sock.peer.state = "closed"
+        end
+        if sock.bound and sock.address and sock.address.path then
+            unixSocks[sock.address.path] = nil
+        end
+
+    elseif sock.backend == "modem" and sock.modem and sock.modemChannel then
+        pcall(sock.modem.close, sock.modemChannel)
+
+    elseif sock.backend == "rednet" then
+    end
+
+    sockets[sock.id] = nil
+end
+
+kernel.syscalls["socket"] = function(domain, socktype)
+    domain   = domain   or "inet"
+    socktype = socktype or "stream"
+    if domain ~= "unix" and domain ~= "inet" then error("EAFNOSUPPORT") end
+    if socktype ~= "stream" and socktype ~= "dgram" then error("EPROTOTYPE") end
+
+    local sock = newSocket(domain, socktype)
+    local fdobj = socketToFd(sock)
+    local fd = kernel.vfs.newfd(fdobj)
+    return fd
+end
+
+kernel.syscalls["bind"] = function(fd, address)
+    local task = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock then error("EBADF") end
+    if sock.bound then error("EINVAL") end
+
+    local parsed = parseAddress(address)
+
+    if parsed.backend == "unix" then
+        local existing = unixSocks[parsed.path]
+        if existing then
+            if existing.state == "closed" then
+                unixSocks[parsed.path] = nil
+            else
+                error("EADDRINUSE")
+            end
+        end
+        sock.backend = "unix"
+        sock.address = parsed
+        sock.bound   = true
+        sock.state   = "bound"
+        unixSocks[parsed.path] = sock
+
+    elseif parsed.backend == "rednet" then
+        ensureRednet()
+        sock.backend = "rednet"
+        sock.address = parsed
+        sock.bound   = true
+        sock.state   = "bound"
+
+    elseif parsed.backend == "modem" then
+        local modem, side = getModem()
+        sock.backend      = "modem"
+        sock.address      = parsed
+        sock.modem        = modem
+        sock.modemChannel = parsed.port
+        sock.bound        = true
+        sock.state        = "bound"
+        modem.open(parsed.port)
+
+    else
+        error("EOPNOTSUPP: cannot bind to " .. parsed.backend .. " address")
+    end
+end
+
+kernel.syscalls["listen"] = function(fd, backlog)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock then error("EBADF") end
+    if not sock.bound then error("EDESTADDRREQ") end
+    sock.listening = true
+    sock.state     = "listening"
+    sock.maxBacklog = backlog or 5
+end
+
+kernel.syscalls["accept"] = function(fd)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock then error("EBADF") end
+    if not sock.listening then error("EINVAL") end
+
+    local deadline = kernel.computer:time() + 30000
+    while #sock.backlog == 0 do
+        pumpAll()
+        if kernel.computer:time() > deadline then error("ETIMEDOUT") end
+        coroutine.yield()
+    end
+
+    local clientSock = table.remove(sock.backlog, 1)
+    local cfdobj     = socketToFd(clientSock)
+    local newfd      = kernel.vfs.newfd(cfdobj)
+    return newfd
+end
+
+kernel.syscalls["connect"] = function(fd, address)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock then error("EBADF") end
+    if sock.connected then error("EISCONN") end
+
+    local parsed = parseAddress(address)
+    sock.address = parsed
+    sock.backend = parsed.backend
+
+    if parsed.backend == "unix" then
+        local server = unixSocks[parsed.path]
+        if not server then error("ECONNREFUSED") end
+        if not server.listening then error("ECONNREFUSED") end
+        if #server.backlog >= (server.maxBacklog or 5) then error("ECONNREFUSED") end
+
+        local serverPeer = newSocket("unix", sock.socktype)
+        serverPeer.backend   = "unix"
+        serverPeer.connected = true
+        serverPeer.state     = "connected"
+        serverPeer.peer      = sock
+
+        sock.peer      = serverPeer
+        sock.connected = true
+        sock.state     = "connected"
+
+        table.insert(server.backlog, serverPeer)
+
+    elseif parsed.backend == "rednet" then
+        ensureRednet()
+        sock.connected = true
+        sock.state     = "connected"
+
+    elseif parsed.backend == "modem" then
+        local modem, side = getModem()
+        local replyChannel = math.random(1024, 65534)
+        sock.modem        = modem
+        sock.modemChannel = replyChannel
+        sock.connected    = true
+        sock.state        = "connected"
+        modem.open(replyChannel)
+
+    elseif parsed.backend == "http" or parsed.backend == "https" then
+        sock.connected = true
+        sock.state     = "connected"
+
+    else
+        error("EAFNOSUPPORT")
+    end
+end
+
+kernel.syscalls["send"] = function(fd, data)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock then error("EBADF") end
+    return sockSend(sock, data)
+end
+
+kernel.syscalls["recv"] = function(fd, maxlen, timeout_ms)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock then error("EBADF") end
+
+    local deadline = kernel.computer:time() + (timeout_ms or 10000)
+    while #sock.rxbuf == 0 do
+        pumpAll()
+        if #sock.rxbuf > 0 then break end
+        if sock.state == "closed" or sock.error then
+            if sock.error then error("ECONNRESET: " .. tostring(sock.error)) end
+            return ""
+        end
+        if kernel.computer:time() > deadline then return "" end
+        coroutine.yield()
+    end
+
+    local item = table.remove(sock.rxbuf, 1)
+    local data = type(item) == "table" and (item.data or "") or tostring(item)
+    if maxlen and #data > maxlen then
+        table.insert(sock.rxbuf, 1, { data=data:sub(maxlen+1), from=item and item.from })
+        data = data:sub(1, maxlen)
+    end
+    return data
+end
+
+kernel.syscalls["sockshutdown"] = function(fd)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if sock then sockClose(sock) end
+end
+
+kernel.syscalls["getpeername"] = function(fd)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock or not sock.connected then error("ENOTCONN") end
+    if sock.address then return sock.address end
+    return nil
+end
+
+kernel.syscalls["getsockname"] = function(fd)
+    local task  = kernel.currentTask
+    local fdobj = task.fd[fd]
+    if not fdobj or not fdobj.isSocket then error("ENOTSOCK") end
+    local sock = sockets[fdobj.sockId]
+    if not sock then error("EBADF") end
+    return sock.address
+end
+
+kernel.syscalls["httpget"] = function(url, headers)
+    local http = kernel.apis and kernel.apis.http
+    if not http then error("ENODEV: no http API") end
+
+    local ok, err = pcall(http.request, url, nil, headers)
+    if not ok then error("ENETDOWN: " .. tostring(err)) end
+
+    local deadline = kernel.computer:time() + 15000
+    while true do
+        local ev = pollEvent()
+        if ev then
+            if ev[1] == "http_success" and ev[2] == url then
+                local handle = ev[3]
+                local body   = handle.readAll and handle.readAll() or ""
+                handle.close()
+                return body
+            elseif ev[1] == "http_failure" and ev[2] == url then
+                error("ECONNREFUSED: " .. tostring(ev[3]))
+            else
+                dispatchEvent(ev)
+            end
+        end
+        if kernel.computer:time() > deadline then error("ETIMEDOUT") end
+        coroutine.yield()
+    end
+end
+
+kernel.syscalls["resolve"] = function(hostname)
+    if hostname:match("^%d+%.%d+%.%d+%.%d+$") then return hostname end
+
+    local a,b,c,d = hostname:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)$")
+    if a and tonumber(a) == 0 and tonumber(b) == 0 then
+        return hostname
+    end
+
+    local http = kernel.apis and kernel.apis.http
+    if not http then error("ENODEV: no http API for DNS") end
+
+    local url = "https://cloudflare-dns.com/dns-query?name=" .. hostname .. "&type=A"
+    local body = kernel.syscalls["httpget"](url, {
+        ["Accept"] = "application/dns-json"
+    })
+
+    local ip = body:match('"type":1[^}]*"data":"([%d%.]+)"')
+    if not ip then error("ENOENT: could not resolve " .. hostname) end
+    return ip
+end
+
+kernel.sockets     = sockets
+kernel.unixSockets = unixSocks
+
+kernel.log("Loaded socket module")

Src/Hyperion-kernel/lib/modules/hyperion/30_userspace.kmod

@@ -1,8 +1,9 @@
--- :Minify:--
+--:Minify:--
 local args = {...}
 local kernel = args[1]
 kernel._G = _G
 
+
 local function readonly(tbl)
     return setmetatable({}, {
         __index = function(_, key)
@@ -20,7 +21,7 @@ local function readonly(tbl)
             error("Attempt to modify global variable '" .. k .. "'", 2)
         end,
 
-        __pairs = function()
+        __pairs = function(self)
             local function iter(_, key)
                 local nextKey, value = next(tbl, key)
                 if type(value) == "table" then
@@ -28,7 +29,7 @@ local function readonly(tbl)
                 end
                 return nextKey, value
             end
-            return iter, tbl, nil
+            return iter, self, nil
         end,
 
         __ipairs = function()
@@ -49,8 +50,24 @@ local function readonly(tbl)
         __metatable = false
     })
 end
+local origLoad = load
 
 kernel._U = readonly(kernel._G)
-kernel.allowGlobalOverwrites = true
 kernel._U._G = kernel._U
-kernel.allowGlobalOverwrites = false
+kernel._U.load = function(a,b,c,d) return origLoad(a,b,c,d or kernel._U) end
+
+function kernel.freshUserEnv()
+    local locals = {}
+    locals.syscall = _makeSyscallProxy()
+
+    local env = setmetatable(locals, {
+        __index    = kernel._U,
+        __newindex = function(_, k, v) rawset(locals, k, v) end,
+        __metatable=false
+    })
+
+    locals._G   = env
+    locals.load = function(a, b, c, d) return origLoad(a, b, c, d or env) end
+
+    return env
+end

Src/Hyperion-kernel/lib/modules/hyperion/40_auth.kmod

@@ -236,19 +236,18 @@ local function nextUID()
     return max + 1
 end
 
-function auth.login(username, password)
+function auth.login(uid, password)
-    if type(username) ~= "string" or type(password) ~= "string" then
+    if type(uid) ~= "number" or type(password) ~= "string" then
         return nil, "Authentication failure"
     end
 
-    local entry = getPasswdByUsername(username)
+    local entry = getPasswdByUID(uid)
     if not entry then
         -- timing attack resistance
         hashPassword(password, "aaaaaaaaaaaaaaaa")
         return nil, "Authentication failure"
     end
 
-    local uid = tonumber(entry[1])
     local sEntry = getShadowByUID(uid)
     if not sEntry then
         hashPassword(password, "aaaaaaaaaaaaaaaa")
@@ -264,14 +263,16 @@ function auth.login(username, password)
     end
 
     kernel.currentUID = uid
-    if kernel.currentProcess then
+
-        kernel.currentProcess.uid  = uid
+    local _task = kernel.currentTask
-        kernel.currentProcess.euid = uid
+    if _task then
-        kernel.currentProcess.gid  = tonumber(entry[2]) or uid
+        _task.uid  = uid
-        kernel.currentProcess.egid = tonumber(entry[2]) or uid
+        _task.euid = uid
+        _task.gid  = tonumber(entry[2]) or uid
+        _task.egid = tonumber(entry[2]) or uid
     end
 
-    kernel.log("AUTH: login uid=" .. tostring(uid) .. " (" .. username .. ")")
+    kernel.log("AUTH: login uid=" .. tostring(uid) .. " (" .. getPasswdByUID(uid)[3] .. ")")
     return true
 end
 
@@ -372,7 +373,7 @@ function auth.newUser(username, password, gid, homedir, shell)
     local uid  = nextUID()
     gid        = tonumber(gid) or uid
     homedir    = homedir or ("/home/" .. username)
-    shell      = shell   or "/bin/sh"
+    shell      = shell   or "/bin/hysh"
 
     passwd[#passwd + 1] = {
         tostring(uid),
@@ -392,6 +393,8 @@ function auth.newUser(username, password, gid, homedir, shell)
 
     if kernel.vfs.mkdir and not kernel.vfs.exists(homedir) then
         kernel.vfs.mkdir(homedir)
+        -- Homedir must be owned by the new user, not root
+        pcall(kernel.vfs.chown, homedir, uid, uid)
     end
 
     kernel.log("AUTH: new user '" .. username .. "' uid=" .. tostring(uid))
@@ -436,11 +439,9 @@ function auth.deleteUser(uid)
     if not entry then return nil, "No such user" end
     local username = entry[3]
 
-    -- Remove from passwd
     for i, v in ipairs(passwd) do
         if tonumber(v[1]) == uid then table.remove(passwd, i); break end
     end
-    -- Remove from shadow
     for i, v in ipairs(shadow) do
         if tonumber(v[1]) == uid then table.remove(shadow, i); break end
     end
@@ -463,7 +464,6 @@ function auth.lockUser(uid)
     local sEntry = getShadowByUID(uid)
     if not sEntry then return nil, "No shadow entry for uid" end
 
-    -- Prefix hash with ! to lock (standard Linux convention)
     if sEntry[3]:sub(1,1) ~= "!" then
         sEntry[3] = "!" .. sEntry[3]
     end
@@ -567,9 +567,6 @@ function auth.setGID(uid, gid)
     return true
 end
 
--- Elevate the calling task to targetUid after verifying targetUsername's password.
--- This is the kernel-side primitive for su/sudo — it bypasses the kernel.uid==0
--- check in sys.setuid because the auth module itself is trusted kernel code.
 function auth.elevate(targetUsername, password)
     if type(targetUsername) ~= "string" or type(password) ~= "string" then
         return nil, "Authentication failure"
@@ -593,33 +590,32 @@ function auth.elevate(targetUsername, password)
         return nil, "Authentication failure"
     end
 
-    -- Directly set the calling task's uid — trusted kernel path
     local task = kernel.currentTask
     local prevUid = task.uid
-    task.uid  = uid
+    task.uid  = 0
-    task.euid = uid
+    task.euid = 0
-    task.gid  = tonumber(entry[2]) or uid
+    task.gid  = 0
-    task.egid = tonumber(entry[2]) or uid
+    task.egid = 0
-    kernel.uid = uid
+    kernel.uid = 0
 
-    kernel.log("AUTH: elevate uid=" .. tostring(prevUid) .. " -> " .. tostring(uid) .. " (" .. targetUsername .. ")")
+    kernel.log("AUTH: elevate uid=" .. tostring(prevUid) .. " -> 0 (via " .. targetUsername .. ")")
     return true, uid
 end
 
 if kernel.syscalls then
-    kernel.syscalls["auth_login"]       = auth.login
+    kernel.syscalls["login"]       = auth.login
-    kernel.syscalls["auth_setpassword"] = auth.setPassword
+    kernel.syscalls["setpassword"] = auth.setPassword
-    kernel.syscalls["auth_setusername"] = auth.setUsername
+    kernel.syscalls["setusername"] = auth.setUsername
-    kernel.syscalls["auth_newuser"]     = auth.newUser
+    kernel.syscalls["newuser"]     = auth.newUser
-    kernel.syscalls["auth_whoami"]      = auth.whoami
+    kernel.syscalls["whoami"]      = auth.whoami
-    kernel.syscalls["auth_getuid"]      = auth.getUID
+    kernel.syscalls["getuidbyname"]= auth.getUID
-    kernel.syscalls["auth_getpasswd"]   = auth.getPasswd
+    kernel.syscalls["getpasswd"]   = auth.getPasswd
-    kernel.syscalls["auth_elevate"]     = auth.elevate
+    kernel.syscalls["elevate"]     = auth.elevate
-    kernel.syscalls["auth_deleteuser"]  = auth.deleteUser
+    kernel.syscalls["deleteuser"]  = auth.deleteUser
-    kernel.syscalls["auth_lockuser"]    = auth.lockUser
+    kernel.syscalls["lockuser"]    = auth.lockUser
-    kernel.syscalls["auth_unlockuser"]  = auth.unlockUser
+    kernel.syscalls["unlockuser"]  = auth.unlockUser
-    kernel.syscalls["auth_listusers"]   = auth.listUsers
+    kernel.syscalls["listusers"]   = auth.listUsers
-    kernel.syscalls["auth_setshell"]    = auth.setShell
+    kernel.syscalls["setshell"]    = auth.setShell
-    kernel.syscalls["auth_sethomedir"]  = auth.setHomedir
+    kernel.syscalls["sethomedir"]  = auth.setHomedir
-    kernel.syscalls["auth_setgid"]      = auth.setGID
+    kernel.syscalls["setgid"]      = auth.setGID
 end

Src/Hyperion-kernel/lib/modules/hyperion/45_hypervisor.kmod

@@ -0,0 +1,495 @@
+--:Minify:--
+local kernel = ...
+local tasks  = {}
+local sys    = {}
+local nextpid = 2
+kernel.exitMain = false
+
+local resumeWithTimeout = coroutine.resumeWithTimeout
+
+local function bit_is_set(num, bit)
+    return math.floor(num / (2 ^ bit)) % 2 == 1
+end
+
+local function loadExecutable(path)
+    kernel.vfs.access(path, "rx")
+
+    local fd   = kernel.vfs.open(path, "r")
+    local data = kernel.vfs.read(fd, 1024 * 1024 * 4)
+    kernel.vfs.close(fd)
+
+    local env = kernel.freshUserEnv()
+
+    local func, err = load(data, "@" .. path, "t", env)
+    if not func then error("ENOEXEC: " .. tostring(err)) end
+
+    local meta       = kernel.vfs.lstat(path)
+    local suid_set   = bit_is_set(meta.perms, 6)
+    local caller_uid = kernel.currentTask and kernel.currentTask.uid or kernel.uid
+    local euid       = suid_set and meta.owner or caller_uid
+
+    return func, euid, suid_set
+end
+
+local function createTask(func, name, envars, args, tgid, real_uid, eff_uid)
+    local id = nextpid
+    nextpid  = nextpid + 1
+
+    tasks[tostring(id)] = {
+        coro = coroutine.create(function()
+            local ok, err = xpcall(func, debug.traceback, table.unpack(args or {}))
+
+            if kernel.config.logTaskExit then
+                if not ok then
+                    kernel.log("Task " .. tostring(id) .. " exited with err: " .. tostring(err), "ERROR", 2)
+                elseif err then
+                    kernel.log("Task " .. tostring(id) .. " exited with code: " .. tostring(err), "INFO")
+                else
+                    kernel.log("Task " .. tostring(id) .. " exited without code", "INFO")
+                end
+            end
+
+            if type(err) == "number" then
+                tasks[tostring(id)].exit = err
+            end
+
+            if tasks[tostring(id)].fd then
+                for fd, _ in pairs(tasks[tostring(id)].fd) do
+                    pcall(kernel.vfs.close, fd)
+                end
+            end
+            tasks[tostring(id)].status = "Z"
+        end),
+
+        name     = name or ("task" .. tostring(id)),
+        envars   = envars or (kernel.currentTask and kernel.currentTask.envars or {}),
+        args     = args or {},
+        status   = "R",
+        pid      = id,
+        tgid     = tgid or (kernel.currentTask and kernel.currentTask.tgid or id),
+        uid      = real_uid,
+        euid     = eff_uid,
+        gid      = (kernel.currentTask and kernel.currentTask.gid) or 0,
+        groups   = (kernel.currentTask and kernel.currentTask.groups) or {},
+        fd       = {},
+        sleep    = 0,
+        ivs      = 0,
+        vs       = 0,
+        children = {},
+        parent   = kernel.currentTask or kernel.kernelTask,
+        siblings = (kernel.currentTask and kernel.currentTask.children) or kernel.kernelTask.children,
+        syscallReturn = {},
+        cwd      = (kernel.currentTask and kernel.currentTask.cwd) or "/",
+        timeSlice = 0,
+        lastTime  = 0,
+        totalTime = 0,
+        numRuns   = 0,
+    }
+
+    table.insert(
+        (kernel.currentTask and kernel.currentTask.children) or kernel.kernelTask.children,
+        tasks[tostring(id)]
+    )
+    return id
+end
+
+function sys.spawn(func, name, envars, args, tgid)
+    local caller   = kernel.currentTask
+    local real_uid = caller and caller.uid  or kernel.uid
+    local eff_uid  = caller and caller.euid or real_uid
+    return createTask(func, name, envars, args, tgid, real_uid, eff_uid)
+end
+
+function sys.execspawn(path, name, envars, args, tgid)
+    local func, euid, suid_active = loadExecutable(path, kernel._U)
+
+    local caller   = kernel.currentTask
+    local real_uid = caller and caller.uid or kernel.uid
+
+    if suid_active then
+        kernel.log(
+            "execspawn: suid exec '" .. path ..
+            "' caller_uid=" .. tostring(real_uid) ..
+            " -> euid=" .. tostring(euid), "INFO"
+        )
+    end
+
+    return createTask(func, name or path, envars, args, tgid, real_uid, euid)
+end
+
+function sys.exec(path, args, envars)
+    local task          = kernel.currentTask
+    local func, euid, _ = loadExecutable(path, kernel._U)
+
+    if task.fd then
+        for fd, _ in pairs(task.fd) do
+            if fd > 2 then pcall(kernel.vfs.close, fd) end
+        end
+    end
+
+    task.euid   = euid
+    task.args   = args or {}
+    task.envars = envars or task.envars
+    task.name   = path
+
+    task.coro = coroutine.create(function()
+        local ok, err = xpcall(func, debug.traceback, table.unpack(task.args))
+        if kernel.config.logTaskExit then
+            if not ok then
+                kernel.log("Task " .. tostring(task.pid) .. " exec '" .. path .. "' err: " .. tostring(err), "ERROR", 2)
+            else
+                kernel.log("Task " .. tostring(task.pid) .. " exec '" .. path .. "' exited: " .. tostring(err), "INFO")
+            end
+        end
+        if type(err) == "number" then tasks[tostring(task.pid)].exit = err end
+        if tasks[tostring(task.pid)].fd then
+            for fd, _ in pairs(tasks[tostring(task.pid)].fd) do
+                pcall(kernel.vfs.close, fd)
+            end
+        end
+        tasks[tostring(task.pid)].status = "Z"
+    end)
+    task.syscallReturn = {}
+    coroutine.yield()
+end
+
+function sys.sleep(s)
+    kernel.currentTask.status = "S"
+    kernel.currentTask.sleep  = kernel.computer:time() + s * 1000
+    coroutine.yield()
+end
+
+function sys.getTask(pid)
+    local task = tasks[tostring(pid)]
+    if not task then return nil end
+
+    local children, siblings = {}, {}
+    for i, v in ipairs(task.children) do children[i] = v.pid end
+    for i, v in ipairs(task.siblings) do siblings[i] = v.pid end
+
+    return {
+        name     = task.name,
+        status   = task.status,
+        pid      = task.pid,
+        tgid     = task.tgid,
+        username = kernel.users[task.uid],
+        uid      = task.uid,
+        euid     = task.euid,
+        exit     = task.exit,
+        sleep    = task.sleep,
+        ivs      = task.ivs,
+        vs       = task.vs,
+        children = children,
+        siblings = siblings,
+        parent   = task.parent.pid,
+        cwd      = task.cwd,
+        term     = task.term,
+    }
+end
+
+function sys.collect(pid)
+    local children = {}
+    for _, v in ipairs(kernel.currentTask.children) do children[#children+1] = v.pid end
+
+    local task = tasks[tostring(pid)]
+    if not task then
+        return false, "Task does not exist"
+    elseif not isEqualToAny(task.pid, table.unpack(children)) then
+        return false, "You do not own this task"
+    elseif task.status ~= "Z" then
+        return false, "Task must exit to collect status"
+    else
+        task.reapTime = 0
+        return true, task.exit
+    end
+end
+
+function sys.kill(pid)
+    local task = tasks[tostring(pid)]
+    if not task then
+        return false, "Task does not exist"
+    elseif task.status == "Z" then
+        return false, "Task is already dead"
+    end
+    local caller = kernel.currentTask
+    local ceuid  = caller and (caller.euid or caller.uid) or kernel.uid
+    if ceuid ~= 0 and task.uid ~= (caller and caller.uid or kernel.uid) then
+        return false, "EPERM"
+    end
+    task.status = "Z"
+    return true
+end
+
+function sys.stop(pid)
+    local task = tasks[tostring(pid)]
+    if not task then
+        return false, "Task does not exist"
+    elseif task.status ~= "R" then
+        return false, "Cannot stop non-running task"
+    else
+        task.status = "T"
+        return true
+    end
+end
+
+function sys.continue(pid)
+    local task = tasks[tostring(pid)]
+    if not task then
+        return false, "Task does not exist"
+    elseif task.status ~= "T" then
+        return false, "Task is not stopped"
+    else
+        task.status = "R"
+        return true
+    end
+end
+
+function sys.getpid()  return kernel.currentTask.pid end
+function sys.getppid() return kernel.currentTask.parent.pid end
+
+function sys.getTasks()
+    local ret = {}
+    for _, v in pairs(tasks) do ret[#ret+1] = v.pid end
+    return ret
+end
+
+function sys.getEnviron(key)      return kernel.currentTask.envars[key] end
+function sys.setEnviron(key, val) kernel.currentTask.envars[key] = val  end
+
+function sys.exit(code)
+    local task = kernel.currentTask
+    if kernel.config.logTaskExit then
+        if code then
+            kernel.log("Task " .. tostring(task.pid) .. " exited with code: " .. tostring(code), "INFO")
+        else
+            kernel.log("Task " .. tostring(task.pid) .. " exited without code", "INFO")
+        end
+    end
+    tasks[tostring(task.pid)].status = "Z"
+    if type(code) == "number" then
+        tasks[tostring(task.pid)].exit = code
+    end
+end
+
+function sys.setuid(uid)
+    local task = kernel.currentTask
+    if task.euid ~= 0 and task.uid ~= uid then
+        error("EPERM")
+    end
+    task.uid  = uid
+    task.euid = uid
+    kernel.uid = uid
+end
+
+function sys.geteuid()
+    return kernel.currentTask.euid
+end
+
+function sys.getuid() return kernel.currentTask.uid end
+
+local function reapDeadTasks()
+    for pid, task in pairs(tasks) do
+        if task.status == "Z" and not task.reapTime then
+            task.coro         = nil
+            task.ivs          = nil
+            task.vs           = nil
+            task.args         = nil
+            task.envars       = nil
+            task.cwd          = nil
+            task.numRuns      = nil
+            task.totalTime    = nil
+            task.lastTime     = nil
+            task.timeSlice    = nil
+            task.syscallReturn = nil
+            task.sleep        = nil
+            task.fd           = nil
+            task.reapTime     = kernel.computer:time() + 30000
+
+        elseif task.reapTime and kernel.computer:time() > task.reapTime
+               and task.status == "Z" then
+            for _, child in ipairs(task.children) do
+                child.parent   = tasks["1"]
+                child.siblings = tasks["1"].children
+                table.insert(tasks["1"].children, child)
+            end
+            for i, sibling in ipairs(task.siblings) do
+                if sibling.pid == task.pid then
+                    table.remove(task.siblings, i)
+                    break
+                end
+            end
+            tasks[pid] = nil
+        end
+    end
+end
+
+local alpha         = 0.85
+local C_target      = 0.01
+local Tmin          = 0.0005
+local Tmax          = 0.5
+local lambda_budget = 0.08
+local lambda_clamp  = 0.03
+local lambda_var    = 0.02
+local k_min         = 0.5
+local k_max         = 0.5
+local B             = 0.01
+
+function kernel.main()
+    while not kernel.exitMain do
+        local N            = 0
+        local Tmin_hit     = 0
+        local Tmax_hit     = 0
+        local totalTaskTime = 0
+        local taskTimes    = {}
+
+        for pid, task in pairs(tasks) do
+            if task.status == "S" and kernel.computer:time() >= task.sleep then
+                task.status = "R"
+                task.sleep  = 0
+            end
+
+            if task.status == "R" then
+                kernel.currentTask = task
+
+                kernel.uid  = task.euid or task.uid
+                kernel.process = task.name
+                N = N + 1
+
+                task.timeSlice = math.min(Tmax, math.max(Tmin, B / (N ^ alpha)))
+
+                if task.sigq and #task.sigq ~= 0 and task.sigh then
+                    local coro = coroutine.create(task.sigh)
+                    local sigret = { coroutine.resume(coro, table.remove(task.sigq, 1)) }
+                    while coroutine.status(coro) ~= "dead" do
+                        if sigret[1] == false then break end
+                        if sigret[2] == "syscall" then
+                            local scname = sigret[3]
+                            local sysret
+                            if kernel.syscalls[scname] then
+                                sysret = { xpcall(kernel.syscalls[scname], debug.traceback, table.unpack(sigret, 4)) }
+                            else
+                                sysret = { false, "Unknown syscall: " .. tostring(scname) }
+                            end
+                            if not sysret[1] then
+                                sigret = { coroutine.resume(coro, false, sysret[2]) }
+                            else
+                                sigret = { coroutine.resume(coro, true, table.unpack(sysret, 2)) }
+                            end
+                        else
+                            sigret = { coroutine.resume(coro) }
+                        end
+                    end
+                end
+
+                if task.status == "R" then
+                    local startTime = kernel.computer:time()
+                    local ret
+
+                    if kernel.config.preempt then
+                        ret = { resumeWithTimeout(task.coro, task.timeSlice, table.unpack(task.syscallReturn)) }
+                    else
+                        ret = { coroutine.resume(task.coro, table.unpack(task.syscallReturn)) }
+                    end
+
+                    local elapsed = kernel.computer:time() - startTime
+                    task.lastTime  = elapsed
+                    task.totalTime = (task.totalTime or 0) + elapsed
+                    task.numRuns   = (task.numRuns  or 0) + 1
+
+                    taskTimes[#taskTimes+1] = elapsed
+                    totalTaskTime = totalTaskTime + elapsed
+
+                    if elapsed <= Tmin then Tmin_hit = Tmin_hit + 1 end
+                    if elapsed >= Tmax then Tmax_hit = Tmax_hit + 1 end
+
+                    if ret[1] == "error" or ret[1] == false then
+                        kernel.log("processHandlerException: " .. tostring(ret[2]), "ERROR", 2)
+                        task.status = "Z"
+                        task.exit   = "processHandlerException: " .. tostring(ret[2])
+
+                    elseif ret[1] == "timeout" then
+                        task.ivs = task.ivs + 1
+                        task.syscallReturn = {}
+
+                    elseif ret[1] == "success" or ret[1] == true then
+                        task.vs = task.vs + 1
+
+                        if ret[2] == "syscall" then
+                            local scname = ret[3]
+                            if kernel.syscalls[scname] then
+                                if kernel.config.debugSyscalls then
+                                    kernel.log("Task " .. task.pid .. " syscall: " .. scname, "DBUG", 5)
+                                    for i = 4, #ret do
+                                        kernel.log("  inval[" .. (i-3) .. "] = " .. tostring(ret[i]), "DBUG", 5)
+                                    end
+                                end
+
+                                local sysret = { xpcall(kernel.syscalls[scname], debug.traceback, table.unpack(ret, 4)) }
+
+                                if kernel.config.debugSyscalls then
+                                    if not sysret[1] then
+                                        kernel.log("Task " .. task.pid .. " syscall " .. scname .. " failed: " .. tostring(sysret[2]), "ERROR", 2)
+                                    else
+                                        kernel.log("Task " .. task.pid .. " syscall " .. scname .. " ok, " .. (#sysret-1) .. " retvals", "DBUG", 5)
+                                        for i = 2, #sysret do
+                                            local v = type(sysret[i]) == "table" and table.serialize(sysret[i]) or tostring(sysret[i])
+                                            kernel.log("  retval[" .. (i-1) .. "] = " .. v, "DBUG", 5)
+                                        end
+                                    end
+                                end
+
+                                if not sysret[1] then
+                                    task.syscallReturn = { false, sysret[2] }
+                                else
+                                    task.syscallReturn = { true, table.unpack(sysret, 2) }
+                                end
+                            else
+                                task.syscallReturn = { false, "Unknown syscall: " .. tostring(scname) }
+                            end
+                        end
+                    end
+                end
+            end
+        end
+
+        local T_prev_avg = (N > 0) and (totalTaskTime / N) or 0
+        local T_prev_var = 0
+        for _, t in ipairs(taskTimes) do
+            T_prev_var = T_prev_var + (t - T_prev_avg) ^ 2
+        end
+        if N > 0 then T_prev_var = T_prev_var / N end
+
+        if N > 0 then
+            local f_clamp  = k_min * (Tmin_hit / N) - k_max * (Tmax_hit / N)
+            local B_budget = (C_target * (N ^ (alpha - 1))) / math.max(T_prev_avg, 1e-8)
+            B = B + lambda_budget * (B_budget - B) + lambda_clamp * f_clamp - lambda_var * T_prev_var
+        end
+
+        reapDeadTasks()
+    end
+end
+
+local sysc = kernel.syscalls
+sysc["spawn"]      = sys.spawn
+sysc["execspawn"]  = sys.execspawn
+sysc["exec"]       = sys.exec
+sysc["sleep"]      = sys.sleep
+sysc["getTask"]    = sys.getTask
+sysc["collect"]    = sys.collect
+sysc["kill"]       = sys.kill
+sysc["stop"]       = sys.stop
+sysc["continue"]   = sys.continue
+sysc["getpid"]     = sys.getpid
+sysc["getppid"]    = sys.getppid
+sysc["getTasks"]   = sys.getTasks
+sysc["setEnviron"] = sys.setEnviron
+sysc["getEnviron"] = sys.getEnviron
+sysc["exit"]       = sys.exit
+sysc["setuid"]     = sys.setuid
+sysc["getuid"]     = sys.getuid
+sysc["geteuid"]    = sys.geteuid
+
+kernel._G.sleep = function(...) coroutine.yield("syscall", "sleep", ...) end
+
+kernel.tasks = tasks
+kernel.hpv   = sys

Src/Hyperion-kernel/lib/modules/hyperion/50_gpio.kmod

@@ -1,3 +1,4 @@
+--:Minify:--
 local kernel=...
 local sysc=kernel.syscalls
 kernel.gpio={}

Src/Hyperion-kernel/lib/modules/hyperion/70_stdlibadv.kmod

@@ -1,4 +1,4 @@
--- :Minify:--
+--:Minify:--
 local kernel = ...
 function print(...)
     local args = {...}

Src/Hyperion-kernel/lib/modules/hyperion/90_init.kmod

@@ -1,8 +1,13 @@
--- :Minify:--
+--:Minify:--
 local kernel = ...
 kernel.log("Loading init system...")
 kernel.log("InitPath: " .. kernel.config.initPath)
 
+local initOk, initErr = pcall(kernel.vfs.access, kernel.config.initPath, "rx")
+if not initOk then
+    kernel.PANIC("Init binary not executable: " .. kernel.config.initPath .. " (" .. tostring(initErr) .. ")")
+end
+
 local handle = kernel.vfs.open(kernel.config.initPath, "r")
 local data   = kernel.vfs.read(handle, 1024 * 1024 * 4)
 kernel.vfs.close(handle)

Src/Hyperion-kernel/lib/modules/hyperion/91_login.kmod

@@ -0,0 +1,9 @@
+--:Minify:--
+local kernel = ...
+
+kernel.processes.login = function()
+    local ok, err = pcall(kernel.hpv.execspawn, "/bin/login", "login")
+    if not ok then
+        kernel.log("Failed to exec /bin/login: " .. tostring(err), "ERROR", 2)
+    end
+end

Src/Hyperion-kernel/lib/modules/hyperion/92_setup.kmod

@@ -0,0 +1,120 @@
+--:Minify:--
+local kernel = ...
+
+local P    = kernel.vfs.P
+local PERM = kernel.vfs.PERM
+
+local RW_R_R    = P.OWNER_R + P.OWNER_W + P.GROUP_R + P.WORLD_R
+local RWX_RX_RX = P.OWNER_R + P.OWNER_W + P.OWNER_X
+                + P.GROUP_R + P.GROUP_X
+                + P.WORLD_R + P.WORLD_X
+local RW_R__    = P.OWNER_R + P.OWNER_W + P.GROUP_R
+local RW____    = P.OWNER_R + P.OWNER_W
+local RWXRWXRWX = PERM.RWXRWXRWX
+local SUID_755  = PERM.SUID_755
+
+local META_VERSION = 0x02
+local rootDisk = kernel.disks["$"]
+
+local function makeEntry(name, etype, owner, group, perms, cmeta)
+    cmeta = cmeta or ""
+    local plo = perms % 256
+    local phi = math.floor(perms / 256) % 256
+    local olo = (owner or 0) % 256
+    local ohi = math.floor((owner or 0) / 256) % 256
+    local glo = (group or 0) % 256
+    local ghi = math.floor((group or 0) / 256) % 256
+    return string.char(#name) .. name
+         .. string.char(etype, olo, ohi, glo, ghi, plo, phi)
+         .. string.char(#cmeta) .. cmeta
+end
+
+local REG = 0x00
+
+local function mergeMeta(dir, entries)
+    local diskDir = dir
+    if diskDir:sub(1,1) == "/" then diskDir = diskDir:sub(2) end
+    local metaPath = (diskDir == "" and ".meta" or diskDir .. "/.meta")
+
+    local existing = {}
+    local rok, rf = pcall(function() return rootDisk:open(metaPath, "r") end)
+    if rok and rf then
+        local raw = rf.read(65535)
+        if rf.close then rf.close() end
+        existing = (kernel.vfs._parseMetafile and kernel.vfs._parseMetafile(raw)) or {}
+    end
+
+    for _, e in ipairs(entries) do
+        local name  = e[1]
+        local etype = e[2] or REG
+        local owner = e[3] or 0
+        local group = e[4] or 0
+        local perms = e[5] or RWX_RX_RX
+        local cmeta = e[6] or ""
+        existing[name] = {
+            etype = etype,
+            owner = owner,
+            group = group,
+            perms = perms,
+            cmeta = cmeta,
+        }
+    end
+
+    local data = string.char(META_VERSION)
+    for name, m in pairs(existing) do
+        data = data .. makeEntry(
+            name,
+            m.etype or REG,
+            m.owner or 0,
+            m.group or 0,
+            m.perms or RWX_RX_RX,
+            m.cmeta or ""
+        )
+    end
+
+    local ok, err = pcall(function()
+        local f = rootDisk:open(metaPath, "w")
+        f.write(data)
+        f.close()
+    end)
+    if not ok then
+        kernel.log("permissions: failed to write " .. metaPath .. ": " .. tostring(err), "WARN", 8)
+    end
+end
+
+if kernel.firstBoot then
+    kernel.log("Seeding filesystem permissions...")
+
+    mergeMeta("/", {
+        {"bin",  REG, 0, 0, RWX_RX_RX},
+        {"boot", REG, 0, 0, RWX_RX_RX},
+        {"dev",  REG, 0, 0, RWXRWXRWX},
+        {"etc",  REG, 0, 0, RWX_RX_RX},
+        {"home", REG, 0, 0, RWX_RX_RX},
+        {"lib",  REG, 0, 0, RWX_RX_RX},
+        {"root", REG, 0, 0, RW____   },
+        {"sbin", REG, 0, 0, RWX_RX_RX},
+        {"tmp",  REG, 0, 0, RWXRWXRWX},
+        {"usr",  REG, 0, 0, RWX_RX_RX},
+        {"var",  REG, 0, 0, RWXRWXRWX},
+        {"opt",  REG, 0, 0, RWX_RX_RX},
+    })
+
+    mergeMeta("/bin", {
+        {"login",       REG, 0, 0, SUID_755 },
+        {"su",          REG, 0, 0, SUID_755 },
+        {"sudo",        REG, 0, 0, SUID_755 },
+    })
+
+    mergeMeta("/etc", {
+        {"passwd", REG, 0, 0, RW_R_R   },
+        {"shadow", REG, 0, 0, RW____   },
+        {"pam.d",  REG, 0, 0, RW____   },
+    })
+
+    mergeMeta("/etc/pam.d", {
+        {"secret", REG, 0, 0, RW____},
+    })
+
+    kernel.log("Filesystem permissions seeded.")
+end

Src/Hyperion-kernel/lib/modules/hyperion/99_final.kmod

@@ -0,0 +1,3 @@
+--:Minify:--
+local kernel = ...
+kernel.allowGlobalOverwrites = false

Src/hysh/bin/chattr

@@ -0,0 +1,162 @@
+--:Minify:--
+-- supports +i/-i (immutable) stored in the file's cmeta/xattr field
+local name = syscall.getTask(syscall.getpid()).name
+local cloptions = { R = false, help = false }
+local args = {}
+local modeStr = nil
+
+for _, v in ipairs({ ... }) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if cloptions[opt] == nil then
+            print(name .. ": unrecognized option '" .. v .. "'")
+            print("try '" .. name .. " --help' for more information.")
+            syscall.exit(1); return
+        end
+        cloptions[opt] = true
+    elseif v:sub(1, 1) == "-" and not v:match("^%-[%+%-]") then
+        local isFlag = true
+        for i = 2, #v do
+            local c = v:sub(i,i)
+            if cloptions[c] ~= nil then
+                cloptions[c] = true
+            else
+                isFlag = false; break
+            end
+        end
+        if not isFlag then
+            modeStr = v
+        end
+    elseif v:sub(1,1) == "+" or (v:sub(1,1) == "-" and v:match("^%-[a-zA-Z]")) then
+        modeStr = v
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " [OPTION]... +-= ATTRS FILE...")
+    print("Change file attributes on a filesystem.")
+    print("")
+    print("Attributes:")
+    print("  i    immutable: file cannot be modified, renamed, or deleted")
+    print("  a    append-only: file can only be appended to")
+    print("")
+    print("Operators:  +attr  add,  -attr  remove")
+    print("Example:  " .. name .. " +i /etc/passwd")
+    print("")
+    print("Options:")
+    print("  -R          operate on files and directories recursively")
+    print("  --help      display this help and exit")
+    return
+end
+
+if not modeStr or #args < 1 then
+    print(name .. ": missing operand")
+    print("try '" .. name .. " --help' for more information.")
+    syscall.exit(1); return
+end
+
+local op    = modeStr:sub(1, 1)
+local attrs = modeStr:sub(2)
+
+if op ~= "+" and op ~= "-" then
+    print(name .. ": invalid operator '" .. op .. "' (use + or -)")
+    syscall.exit(1); return
+end
+
+local function getXattr(path)
+    local stat = pcall(function() return syscall.stat(path) end) and syscall.stat(path)
+    if stat then return stat.xattr or "" end
+    return ""
+end
+
+local IMMUTABLE_TAG  = "|i"
+local APPENDONLY_TAG = "|a"
+
+local function attrTag(c)
+    if c == "i" then return IMMUTABLE_TAG
+    elseif c == "a" then return APPENDONLY_TAG
+    else return nil end
+end
+
+local function chattrPath(path)
+    local stat = syscall.stat(path)
+    if not stat then
+        print(name .. ": cannot stat '" .. path .. "': No such file or directory")
+        return false
+    end
+    if stat.etype == 0x01 then
+        return true
+    end
+
+    if not syscall.setxattr then
+        print(name .. ": kernel does not expose setxattr syscall; cannot modify attributes")
+        syscall.exit(1); return false
+    end
+
+    local xattr = stat.xattr or ""
+
+    for i = 1, #attrs do
+        local c = attrs:sub(i, i)
+        local tag = attrTag(c)
+        if not tag then
+            print(name .. ": unsupported attribute '" .. c .. "'")
+            syscall.exit(1); return false
+        end
+        local hasTag = xattr:find(tag, 1, true)
+        if op == "+" and not hasTag then
+            xattr = xattr .. tag
+        elseif op == "-" and hasTag then
+            xattr = xattr:gsub(tag:gsub("|", "%%|"), "")
+        end
+    end
+
+    local ok, err = pcall(syscall.setxattr, path, xattr)
+    if not ok then
+        print(name .. ": cannot set attributes on '" .. path .. "': " .. tostring(err))
+        return false
+    end
+    return true
+end
+
+local function chattrRecursive(path)
+    if not chattrPath(path) then return end
+    if syscall.type(path) == "directory" then
+        local ok, list = pcall(syscall.listdir, path)
+        if ok then
+            for _, entry in ipairs(list) do
+                local child = path
+                if child:sub(-1) ~= "/" then child = child .. "/" end
+                chattrRecursive(child .. entry)
+            end
+        end
+    end
+end
+
+local cwd = syscall.getcwd()
+local function absPath(p)
+    if p:sub(1,1) ~= "/" then p = cwd .. "/" .. p end
+    return p
+end
+
+if not syscall.setxattr then
+    print(name .. ": kernel does not expose setxattr; attributes cannot be persisted")
+    print(name .. ": add  sys[\"setxattr\"] = vfs.setxattr  to 10_vfs.kmod to enable this")
+    syscall.exit(1); return
+end
+
+local exitCode = 0
+for i = 1, #args do
+    local path = absPath(args[i])
+    if not syscall.exists(path) then
+        print(name .. ": cannot access '" .. args[i] .. "': No such file or directory")
+        exitCode = 1
+    elseif cloptions.R then
+        chattrRecursive(path)
+    else
+        if not chattrPath(path) then exitCode = 1 end
+    end
+end
+
+syscall.exit(exitCode)

Src/hysh/bin/chgrp

@@ -0,0 +1,117 @@
+--:Minify:--
+-- chgrp: change group ownership
+local name  = syscall.getTask(syscall.getpid()).name
+local cloptions = { R = false, help = false }
+local args = {}
+
+for _, v in ipairs({ ... }) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if cloptions[opt] == nil then
+            print(name .. ": unrecognized option '" .. v .. "'")
+            print("try '" .. name .. " --help' for more information.")
+            syscall.exit(1); return
+        end
+        cloptions[opt] = true
+    elseif v:sub(1, 1) == "-" then
+        for i = 2, #v do
+            local opt = v:sub(i, i)
+            if cloptions[opt] == nil then
+                print(name .. ": invalid option '-" .. opt .. "'")
+                print("try '" .. name .. " --help' for more information.")
+                syscall.exit(1); return
+            end
+            cloptions[opt] = true
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " [OPTION]... GROUP FILE...")
+    print("Change the group of each FILE to GROUP.")
+    print("GROUP may be a group name or numeric ID.")
+    print("")
+    print("Options:")
+    print("  -R          operate on files and directories recursively")
+    print("  --help      display this help and exit")
+    return
+end
+
+if #args < 2 then
+    print(name .. ": missing operand")
+    print("try '" .. name .. " --help' for more information.")
+    syscall.exit(1); return
+end
+
+local groupStr = args[1]
+
+local function resolveGid(s)
+    local n = tonumber(s)
+    if n then return n end
+    local uid = syscall.getuidbyname and syscall.getuidbyname(s)
+    if uid then
+        local pwent = syscall.getpasswd(uid)
+        if pwent then return pwent.gid end
+    end
+    print(name .. ": invalid group: '" .. s .. "'")
+    syscall.exit(1)
+end
+
+local newGid = resolveGid(groupStr)
+
+local function chgrpPath(path)
+    local stat = syscall.stat(path)
+    if not stat then
+        print(name .. ": cannot stat '" .. path .. "': no such file or directory")
+        return false
+    end
+    local ok, err = pcall(syscall.chown, path, stat.owner, newGid)
+    if not ok then
+        local msg = tostring(err)
+        if msg:find("EPERM") or msg:find("EACCES") then
+            msg = "operation not permitted (must be root)"
+        elseif msg:find("ENOENT") then
+            msg = "no such file or directory"
+        end
+        print(name .. ": cannot change group of '" .. path .. "': " .. msg)
+        return false
+    end
+    return true
+end
+
+local function chgrpRecursive(path)
+    if not chgrpPath(path) then return end
+    if syscall.type(path) == "directory" then
+        local ok, list = pcall(syscall.listdir, path)
+        if ok then
+            for _, entry in ipairs(list) do
+                local child = path
+                if child:sub(-1) ~= "/" then child = child .. "/" end
+                chgrpRecursive(child .. entry)
+            end
+        end
+    end
+end
+
+local cwd = syscall.getcwd()
+local function absPath(p)
+    if p:sub(1,1) ~= "/" then p = cwd .. "/" .. p end
+    return p
+end
+
+local exitCode = 0
+for i = 2, #args do
+    local path = absPath(args[i])
+    if not syscall.exists(path) then
+        print(name .. ": cannot access '" .. args[i] .. "': No such file or directory")
+        exitCode = 1
+    elseif cloptions.R then
+        chgrpRecursive(path)
+    else
+        if not chgrpPath(path) then exitCode = 1 end
+    end
+end
+
+syscall.exit(exitCode)

Src/hysh/bin/chmod

@@ -0,0 +1,268 @@
+--:Minify:--
+local name = syscall.getTask(syscall.getpid()).name
+local cloptions = { R = false, help = false }
+local args = {}
+
+for _, v in ipairs({ ... }) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if cloptions[opt] == nil then
+            print(name .. ": unrecognized option '" .. v .. "'")
+            print("try '" .. name .. " --help' for more information.")
+            syscall.exit(1); return
+        end
+        cloptions[opt] = true
+    elseif v:sub(1, 1) == "-" then
+        for i = 2, #v do
+            local opt = v:sub(i, i)
+            if cloptions[opt] == nil then
+                print(name .. ": invalid option '-" .. opt .. "'")
+                print("try '" .. name .. " --help' for more information.")
+                syscall.exit(1); return
+            end
+            cloptions[opt] = true
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " [OPTION]... MODE FILE...")
+    print("Change the file mode bits of each FILE to MODE.")
+    print("")
+    print("MODE may be octal (e.g. 755) or symbolic (e.g. u+x, go-w, a=r).")
+    print("")
+    print("Octal bit layout (Hyperion):")
+    print("  owner: r=32 w=16 x=512   group: r=8 w=4 x=256")
+    print("  world: r=2  w=1  x=128   suid=64")
+    print("  Common: 644=rw-r--r--  755=rwxr-xr-x  700=rwx------")
+    print("")
+    print("Symbolic: [ugoa][+-=][rwxs]  (comma-separated list)")
+    print("")
+    print("Options:")
+    print("  -R          change files and directories recursively")
+    print("  --help      display this help and exit")
+    return
+end
+
+if #args < 2 then
+    print(name .. ": missing operand")
+    print("try '" .. name .. " --help' for more information.")
+    syscall.exit(1); return
+end
+
+local modeArg = args[1]
+
+local P = {
+    OWNER_R = 32, OWNER_W = 16, OWNER_X = 512,
+    GROUP_R = 8,  GROUP_W = 4,  GROUP_X = 256,
+    WORLD_R = 2,  WORLD_W = 1,  WORLD_X = 128,
+    SUID    = 64,
+}
+
+local function bit_is_set(num, bit)
+    return math.floor(num / (2 ^ bit)) % 2 == 1
+end
+
+local function parseOctal(s)
+    local n = tonumber(s, 8)
+    if not n then return nil end
+
+    local result = 0
+    if bit_is_set(n, 8) then result = result + P.OWNER_R end  -- 0400
+    if bit_is_set(n, 7) then result = result + P.OWNER_W end  -- 0200
+    if bit_is_set(n, 6) then result = result + P.OWNER_X end  -- 0100
+
+    if bit_is_set(n, 5) then result = result + P.GROUP_R end  -- 040
+    if bit_is_set(n, 4) then result = result + P.GROUP_W end  -- 020
+    if bit_is_set(n, 3) then result = result + P.GROUP_X end  -- 010
+
+    if bit_is_set(n, 2) then result = result + P.WORLD_R end  -- 004
+    if bit_is_set(n, 1) then result = result + P.WORLD_W end  -- 002
+    if bit_is_set(n, 0) then result = result + P.WORLD_X end  -- 001
+
+    if bit_is_set(n, 11) then result = result + P.SUID end
+
+    return result
+end
+
+local function applySymbolic(modeStr, existingPerms)
+    local perms = existingPerms
+
+    for clause in (modeStr .. ","):gmatch("([^,]+),") do
+        local who_str, rest = clause:match("^([ugoa]*)([+%-=].+)$")
+        if not who_str then
+            print(name .. ": invalid mode: '" .. clause .. "'")
+            syscall.exit(1); return nil
+        end
+        if who_str == "" or who_str == "a" then who_str = "ugo" end
+
+        local op   = rest:sub(1, 1)
+        local bits_str = rest:sub(2)
+
+        local mask = 0
+        for i = 1, #bits_str do
+            local c = bits_str:sub(i, i)
+            for j = 1, #who_str do
+                local w = who_str:sub(j, j)
+                if c == "r" then
+                    if w == "u" then mask = mask + P.OWNER_R
+                    elseif w == "g" then mask = mask + P.GROUP_R
+                    elseif w == "o" then mask = mask + P.WORLD_R end
+                elseif c == "w" then
+                    if w == "u" then mask = mask + P.OWNER_W
+                    elseif w == "g" then mask = mask + P.GROUP_W
+                    elseif w == "o" then mask = mask + P.WORLD_W end
+                elseif c == "x" then
+                    if w == "u" then mask = mask + P.OWNER_X
+                    elseif w == "g" then mask = mask + P.GROUP_X
+                    elseif w == "o" then mask = mask + P.WORLD_X end
+                elseif c == "s" then
+                    if w == "u" then mask = mask + P.SUID end
+                end
+            end
+        end
+
+        if op == "+" then
+            perms = perms + (mask - (perms % (mask + 1) - perms % mask > 0 and 0 or 0))
+
+            perms = perms - (perms % 1)
+            local function bor(a, b)
+                local result, bit = 0, 1
+                while a > 0 or b > 0 do
+                    if (a % 2 == 1) or (b % 2 == 1) then result = result + bit end
+                    a = math.floor(a / 2); b = math.floor(b / 2); bit = bit * 2
+                end
+                return result
+            end
+            perms = bor(perms, mask)
+        elseif op == "-" then
+            local function band(a, b)
+                local result, bit = 0, 1
+                while a > 0 and b > 0 do
+                    if (a % 2 == 1) and (b % 2 == 1) then result = result + bit end
+                    a = math.floor(a / 2); b = math.floor(b / 2); bit = bit * 2
+                end
+                return result
+            end
+            local function bxor(a, b)
+                local result, bit = 0, 1
+                while a > 0 or b > 0 do
+                    if (a % 2 == 1) ~= (b % 2 == 1) then result = result + bit end
+                    a = math.floor(a / 2); b = math.floor(b / 2); bit = bit * 2
+                end
+                return result
+            end
+            perms = bxor(perms, band(perms, mask))
+        elseif op == "=" then
+            local clearMask = 0
+            for j = 1, #who_str do
+                local w = who_str:sub(j, j)
+                if w == "u" then clearMask = clearMask + P.OWNER_R + P.OWNER_W + P.OWNER_X + P.SUID
+                elseif w == "g" then clearMask = clearMask + P.GROUP_R + P.GROUP_W + P.GROUP_X
+                elseif w == "o" then clearMask = clearMask + P.WORLD_R + P.WORLD_W + P.WORLD_X end
+            end
+            local function bxor(a, b)
+                local result, bit = 0, 1
+                while a > 0 or b > 0 do
+                    if (a % 2 == 1) ~= (b % 2 == 1) then result = result + bit end
+                    a = math.floor(a / 2); b = math.floor(b / 2); bit = bit * 2
+                end
+                return result
+            end
+            local function band(a, b)
+                local result, bit = 0, 1
+                while a > 0 and b > 0 do
+                    if (a % 2 == 1) and (b % 2 == 1) then result = result + bit end
+                    a = math.floor(a / 2); b = math.floor(b / 2); bit = bit * 2
+                end
+                return result
+            end
+            local function bor(a, b)
+                local result, bit = 0, 1
+                while a > 0 or b > 0 do
+                    if (a % 2 == 1) or (b % 2 == 1) then result = result + bit end
+                    a = math.floor(a / 2); b = math.floor(b / 2); bit = bit * 2
+                end
+                return result
+            end
+            perms = bxor(perms, band(perms, clearMask))
+            perms = bor(perms, mask)
+        else
+            print(name .. ": invalid operator in mode: '" .. clause .. "'")
+            syscall.exit(1); return nil
+        end
+    end
+
+    return perms
+end
+
+local function resolveMode(modeStr, existingPerms)
+    if modeStr:match("^[0-7]+$") then
+        local p = parseOctal(modeStr)
+        if p then return p end
+    end
+
+    return applySymbolic(modeStr, existingPerms)
+end
+
+local function chmodPath(path)
+    local stat, err = pcall(syscall.stat, path)
+    local existingPerms = 0
+    if stat then
+        local s = syscall.stat(path)
+        existingPerms = s and s.perms or 0
+    end
+
+    local newPerms = resolveMode(modeArg, existingPerms)
+    if newPerms == nil then return false end
+
+    local ok, cerr = pcall(syscall.chmod, path, newPerms)
+    if not ok then
+        local msg = tostring(cerr)
+        if msg:find("EACCES") or msg:find("EPERM") then
+            msg = "permission denied"
+        elseif msg:find("ENOENT") then
+            msg = "no such file or directory"
+        end
+        print(name .. ": cannot change permissions of '" .. path .. "': " .. msg)
+        return false
+    end
+    return true
+end
+
+local function chmodRecursive(path)
+    if not chmodPath(path) then return end
+    if syscall.type(path) == "directory" then
+        local ok, list = pcall(syscall.listdir, path)
+        if ok then
+            for _, entry in ipairs(list) do
+                local child = path
+                if child:sub(-1) ~= "/" then child = child .. "/" end
+                chmodRecursive(child .. entry)
+            end
+        end
+    end
+end
+
+local cwd = syscall.getcwd()
+local function absPath(p)
+    if p:sub(1,1) ~= "/" then p = cwd .. "/" .. p end
+    return p
+end
+
+local exitCode = 0
+for i = 2, #args do
+    local path = absPath(args[i])
+    if not syscall.exists(path) then
+        print(name .. ": cannot access '" .. args[i] .. "': No such file or directory")
+        exitCode = 1
+    elseif cloptions.R then
+        chmodRecursive(path)
+    else
+        if not chmodPath(path) then exitCode = 1 end
+    end
+end
+
+syscall.exit(exitCode)

Src/hysh/bin/chown

@@ -0,0 +1,150 @@
+--:Minify:--
+local name = syscall.getTask(syscall.getpid()).name
+local cloptions = { R = false, help = false }
+local args = {}
+
+for _, v in ipairs({ ... }) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if cloptions[opt] == nil then
+            print(name .. ": unrecognized option '" .. v .. "'")
+            print("try '" .. name .. " --help' for more information.")
+            syscall.exit(1); return
+        end
+        cloptions[opt] = true
+    elseif v:sub(1, 1) == "-" then
+        for i = 2, #v do
+            local opt = v:sub(i, i)
+            if cloptions[opt] == nil then
+                print(name .. ": invalid option '-" .. opt .. "'")
+                print("try '" .. name .. " --help' for more information.")
+                syscall.exit(1); return
+            end
+            cloptions[opt] = true
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " [OPTION]... OWNER[:GROUP] FILE...")
+    print("       " .. name .. " [OPTION]... :GROUP FILE...")
+    print("Change the owner and/or group of each FILE.")
+    print("OWNER and GROUP may be names or numeric IDs.")
+    print("")
+    print("Options:")
+    print("  -R          operate on files and directories recursively")
+    print("  --help      display this help and exit")
+    return
+end
+
+if #args < 2 then
+    print(name .. ": missing operand")
+    print("try '" .. name .. " --help' for more information.")
+    syscall.exit(1); return
+end
+
+local spec = args[1]
+local ownerStr, groupStr
+
+if spec:sub(1,1) == ":" then
+    groupStr = spec:sub(2)
+else
+    local colon = spec:find(":", 1, true)
+    if colon then
+        ownerStr = spec:sub(1, colon - 1)
+        groupStr = spec:sub(colon + 1)
+        if groupStr == "" then groupStr = nil end
+    else
+        ownerStr = spec
+    end
+end
+
+local function resolveUid(s)
+    if not s or s == "" then return nil end
+    local n = tonumber(s)
+    if n then return n end
+    local uid = syscall.getuidbyname and syscall.getuidbyname(s)
+    if uid then return uid end
+    print(name .. ": invalid user: '" .. s .. "'")
+    syscall.exit(1)
+end
+
+local function resolveGid(s)
+    if not s or s == "" then return nil end
+    local n = tonumber(s)
+    if n then return n end
+    local uid = syscall.getuidbyname and syscall.getuidbyname(s)
+    if uid then
+        local pwent = syscall.getpasswd(uid)
+        if pwent then return pwent.gid end
+    end
+    print(name .. ": invalid group: '" .. s .. "'")
+    syscall.exit(1)
+end
+
+local newUid = resolveUid(ownerStr)
+local newGid = resolveGid(groupStr)
+
+if newUid == nil and newGid == nil then
+    print(name .. ": no owner or group specified")
+    syscall.exit(1); return
+end
+
+local function chownPath(path)
+    local stat = syscall.stat(path)
+    if not stat then
+        print(name .. ": cannot stat '" .. path .. "': no such file or directory")
+        return false
+    end
+    local uid = newUid ~= nil and newUid or stat.owner
+    local gid = newGid ~= nil and newGid or stat.group
+    local ok, err = pcall(syscall.chown, path, uid, gid)
+    if not ok then
+        local msg = tostring(err)
+        if msg:find("EPERM") or msg:find("EACCES") then
+            msg = "operation not permitted (must be root)"
+        elseif msg:find("ENOENT") then
+            msg = "no such file or directory"
+        end
+        print(name .. ": cannot change owner of '" .. path .. "': " .. msg)
+        return false
+    end
+    return true
+end
+
+local function chownRecursive(path)
+    if not chownPath(path) then return end
+    if syscall.type(path) == "directory" then
+        local ok, list = pcall(syscall.listdir, path)
+        if ok then
+            for _, entry in ipairs(list) do
+                local child = path
+                if child:sub(-1) ~= "/" then child = child .. "/" end
+                chownRecursive(child .. entry)
+            end
+        end
+    end
+end
+
+local cwd = syscall.getcwd()
+local function absPath(p)
+    if p:sub(1,1) ~= "/" then p = cwd .. "/" .. p end
+    return p
+end
+
+local exitCode = 0
+for i = 2, #args do
+    local path = absPath(args[i])
+    if not syscall.exists(path) then
+        print(name .. ": cannot access '" .. args[i] .. "': No such file or directory")
+        exitCode = 1
+    elseif cloptions.R then
+        chownRecursive(path)
+    else
+        if not chownPath(path) then exitCode = 1 end
+    end
+end
+
+syscall.exit(exitCode)

Src/hysh/bin/chroot

@@ -0,0 +1,83 @@
+--:Minify:--
+local name = syscall.getTask(syscall.getpid()).name
+local args = {}
+local cloptions = { help = false }
+
+for _, v in ipairs({ ... }) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if opt == "help" then
+            cloptions.help = true
+        else
+            print(name .. ": unrecognized option '" .. v .. "'")
+            print("try '" .. name .. " --help' for more information.")
+            syscall.exit(1); return
+        end
+    elseif v:sub(1, 1) == "-" then
+        print(name .. ": invalid option '" .. v .. "'")
+        print("try '" .. name .. " --help' for more information.")
+        syscall.exit(1); return
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " NEWROOT [COMMAND [ARG]...]")
+    print("Run COMMAND with root directory set to NEWROOT.")
+    print("If COMMAND is omitted, runs the current user's shell.")
+    print("")
+    print("Requires root (uid 0).")
+    return
+end
+
+if #args < 1 then
+    print(name .. ": missing operand")
+    print("try '" .. name .. " --help' for more information.")
+    syscall.exit(1); return
+end
+
+local euid = syscall.geteuid and syscall.geteuid() or syscall.getuid()
+if euid ~= 0 then
+    print(name .. ": cannot change root directory: Permission denied")
+    syscall.exit(1); return
+end
+
+local newRoot = args[1]
+if newRoot:sub(1,1) ~= "/" then
+    newRoot = syscall.getcwd() .. "/" .. newRoot
+end
+
+if not syscall.exists(newRoot) then
+    print(name .. ": cannot change root directory to '" .. args[1] .. "': No such file or directory")
+    syscall.exit(1); return
+end
+
+if syscall.type(newRoot) ~= "directory" then
+    print(name .. ": '" .. args[1] .. "': Not a directory")
+    syscall.exit(1); return
+end
+
+local ok, err = pcall(syscall.chroot, newRoot)
+if not ok then
+    print(name .. ": cannot change root directory to '" .. args[1] .. "': " .. tostring(err))
+    syscall.exit(1); return
+end
+
+local shell
+if #args >= 2 then
+    shell = args[2]
+else
+    local uid  = syscall.getuid()
+    local pwent = syscall.getpasswd(uid)
+    shell = (pwent and pwent.shell) or "/bin/hysh"
+end
+
+local execArgs = {}
+for i = 3, #args do table.insert(execArgs, args[i]) end
+
+local execOk, execErr = pcall(syscall.exec, shell, execArgs)
+if not execOk then
+    print(name .. ": failed to run command '" .. shell .. "': " .. tostring(execErr))
+    syscall.exit(127)
+end

Src/hysh/bin/help

@@ -0,0 +1,309 @@
+--:Minify:--
+
+local COMMANDS = {
+    { name="cd",       usage="cd [dir]",              desc="Change working directory. Use '-' to return to previous directory.", flags={} },
+    { name="pwd",      usage="pwd",                   desc="Print current working directory.", flags={} },
+    { name="ls",       usage="ls [-alh] [dir]",       desc="List directory contents. Coloured by type: dirs=blue, symlinks=cyan, executables=green.", flags={
+        {"-a","Show hidden files (starting with .)"},
+        {"-l","Long format: permissions, owner, group, size, mtime, name"},
+        {"-h","Human-readable file sizes (with -l)"},
+        {"--help","Display help and exit"},
+    }},
+    { name="find",     usage="find [path] [-name PAT] [-type f|d|l] [-maxdepth N]", desc="Walk the filesystem tree and print matching paths.", flags={
+        {"-name PAT",  "Match filename against shell glob (* and ?)"},
+        {"-type f|d|l","Filter by file, directory, or symlink"},
+        {"-maxdepth N","Descend at most N directory levels"},
+        {"-mindepth N","Skip entries shallower than N levels"},
+        {"-empty",     "Match empty files or empty directories"},
+    }},
+    { name="cp",       usage="cp [-rRp] SOURCE... DEST", desc="Copy files or directories.", flags={
+        {"-r,-R","Recurse into directories"},
+        {"-p",   "Preserve permissions"},
+        {"--help","Display help and exit"},
+    }},
+    { name="mv",       usage="mv [-f] SOURCE... DEST", desc="Move or rename files and directories.", flags={
+        {"-f",   "Do not prompt before overwriting (default)"},
+        {"--help","Display help and exit"},
+    }},
+    { name="rm",       usage="rm [-rRf] FILE...", desc="Remove files or directories.", flags={
+        {"-r,-R","Recursively remove directories and their contents"},
+        {"-f",   "Ignore nonexistent files, never prompt"},
+        {"--help","Display help and exit"},
+    }},
+    { name="touch",    usage="touch FILE...",          desc="Create an empty file, or no-op if it already exists.", flags={} },
+    { name="mkdir",    usage="mkdir <dir>",            desc="Create a directory.", flags={} },
+    { name="ln",       usage="ln -s [-f] TARGET LINK", desc="Create a symbolic link. Multiple targets can be linked into a directory.", flags={
+        {"-s",   "Create a symbolic link (required; hard links not supported)"},
+        {"-f",   "Remove existing destination before creating link"},
+        {"--help","Display help and exit"},
+    }},
+    { name="cat",      usage="cat [file...]",          desc="Print file(s) to stdout. Reads stdin if no file given.", flags={} },
+    { name="head",     usage="head [-n N] [file...]",  desc="Print the first N lines of each file (default 10).", flags={
+        {"-n N","Number of lines to print"},
+        {"--help","Display help and exit"},
+    }},
+    { name="tail",     usage="tail [-n N] [file...]",  desc="Print the last N lines of each file (default 10).", flags={
+        {"-n N","Number of lines to print"},
+        {"--help","Display help and exit"},
+    }},
+    { name="wc",       usage="wc [-lwc] [file...]",    desc="Count lines, words, and bytes in files.", flags={
+        {"-l","Print line count"},
+        {"-w","Print word count"},
+        {"-c","Print byte count"},
+        {"--help","Display help and exit"},
+    }},
+    { name="grep",     usage="grep [-ivnlcrR] PATTERN [file...]", desc="Search for lines matching a Lua pattern.", flags={
+        {"-i","Ignore case"},
+        {"-v","Invert: select non-matching lines"},
+        {"-n","Prefix output with line numbers"},
+        {"-l","Print only filenames that contain a match"},
+        {"-c","Print count of matching lines per file"},
+        {"-r,-R","Recurse into directories"},
+        {"--help","Display help and exit"},
+    }},
+    { name="sed",      usage="sed 's/PAT/REPL/' [file...]", desc="Stream editor. Applies substitution commands to each line.", flags={} },
+    { name="sort",     usage="sort [-rnu] [file...]",  desc="Sort lines of text.", flags={
+        {"-r","Reverse the sort order"},
+        {"-n","Numeric sort"},
+        {"-u","Suppress duplicate lines"},
+        {"--help","Display help and exit"},
+    }},
+    { name="uniq",     usage="uniq [-cdui] [input [output]]", desc="Filter adjacent duplicate lines.", flags={
+        {"-c","Prefix each line with its repetition count"},
+        {"-d","Print only lines that appear more than once"},
+        {"-u","Print only lines that appear exactly once"},
+        {"-i","Ignore case when comparing"},
+        {"--help","Display help and exit"},
+    }},
+    { name="tee",      usage="tee [-a] [file...]",     desc="Copy stdin to stdout and to each FILE simultaneously.", flags={
+        {"-a","Append to files instead of overwriting"},
+        {"--help","Display help and exit"},
+    }},
+    { name="basename", usage="basename STRING [SUFFIX]", desc="Strip directory and optional suffix from a path.", flags={} },
+    { name="dirname",  usage="dirname STRING...",       desc="Strip the last component from a path.", flags={} },
+    { name="readlink", usage="readlink [-fenq] file...", desc="Print the target of a symbolic link.", flags={
+        {"-f","Canonicalize: follow every symlink component"},
+        {"-e","Like -f but all components must exist"},
+        {"-n","Do not output trailing newline"},
+        {"--help","Display help and exit"},
+    }},
+    { name="stat",     usage="stat file...",            desc="Display file type, size, owner, group, and permissions.", flags={
+        {"--help","Display help and exit"},
+    }},
+    { name="chmod",    usage="chmod [-R] MODE file...", desc="Change file permissions. MODE may be octal (755) or symbolic (u+x).", flags={
+        {"-R",   "Recurse into directories"},
+        {"--help","Display help and exit"},
+    }},
+    { name="chown",    usage="chown [-R] USER[:GROUP] file...", desc="Change file owner and/or group.", flags={
+        {"-R","Recurse into directories"},
+        {"--help","Display help and exit"},
+    }},
+    { name="chgrp",    usage="chgrp [-R] GROUP file...", desc="Change file group ownership.", flags={
+        {"-R","Recurse into directories"},
+        {"--help","Display help and exit"},
+    }},
+    { name="chattr",   usage="chattr [+-=][attrs] file...", desc="Change file attributes.", flags={} },
+    { name="echo",     usage="echo [text...]",          desc="Print arguments to stdout.", flags={} },
+    { name="whoami",   usage="whoami",                  desc="Print the current username.", flags={} },
+    { name="id",       usage="id [username]",            desc="Print user identity (uid, gid).", flags={} },
+    { name="ps",       usage="ps",                      desc="List running tasks with pid, user, name, and status.", flags={} },
+    { name="hostname", usage="hostname [NAME]",          desc="Print or set the system hostname.", flags={} },
+    { name="uname",    usage="uname [-asnrm]",           desc="Print system information (OS name, hostname, release, machine).", flags={
+        {"-a","Print all fields"},
+        {"-s","Kernel name"},
+        {"-n","Node hostname"},
+        {"-r","Kernel release"},
+        {"-m","Machine hardware name"},
+        {"--help","Display help and exit"},
+    }},
+    { name="df",       usage="df [-h] [path...]",        desc="Report filesystem disk space usage.", flags={
+        {"-h","Human-readable sizes (K, M, G)"},
+        {"--help","Display help and exit"},
+    }},
+    { name="stat",     usage="stat file...",             desc="Display file status: type, size, permissions, owner.", flags={} },
+    { name="env",      usage="env [KEY=VAL]... [CMD]",   desc="Print the environment, or run a command with modified environment.", flags={} },
+    { name="printenv", usage="printenv [NAME...]",        desc="Print environment variable values (all if no names given).", flags={} },
+    { name="sleep",    usage="sleep N[smhd]",            desc="Pause for N seconds (or minutes/hours/days with m/h/d suffix).", flags={} },
+    { name="true",     usage="true",                     desc="Do nothing, exit successfully (status 0).", flags={} },
+    { name="false",    usage="false",                    desc="Do nothing, exit unsuccessfully (status 1).", flags={} },
+    { name="yes",      usage="yes [text]",               desc="Repeatedly print 'y' (or given text) until interrupted.", flags={} },
+    { name="mount",    usage="mount [-o loop] [SRC DEST | ID MNT]", desc="Mount a loop device or show all current mounts.", flags={
+        {"-o loop","Attach SRC as a loop device and mount at DEST in one step"},
+        {"--help","Display help and exit"},
+    }},
+    { name="umount",   usage="umount [--no-detach] MOUNTPOINT | -l LOOPID", desc="Unmount a filesystem and auto-detach its loop device.", flags={
+        {"--no-detach","Unmount but keep loop device attached"},
+        {"-l LOOPID","Force-detach a loop device without unmounting"},
+        {"--help","Display help and exit"},
+    }},
+    { name="losetup",  usage="losetup [-dil] [path]",    desc="Attach a directory or .hfs image as a loop device.", flags={
+        {"-d ID","Detach loop device"},
+        {"-i path","Force image mode (even without .hfs extension)"},
+        {"-l","List all attached loop devices"},
+        {"--help","Display help and exit"},
+    }},
+    { name="loimgcreate", usage="loimgcreate [-x] SRC DEST", desc="Pack a directory into a portable HFS image, or extract one.", flags={
+        {"-x","Extract image to destination directory"},
+        {"--help","Display help and exit"},
+    }},
+    { name="useradd",  usage="useradd [-p pw] [-g gid] [-d home] [-s shell] [-M] <user>", desc="Create a new user account.", flags={
+        {"-p pw",   "Set password"},
+        {"-g gid",  "Set primary group id"},
+        {"-d home", "Set home directory (default /home/username)"},
+        {"-s shell","Set login shell (default /bin/hysh)"},
+        {"-M",      "Do not create home directory"},
+    }},
+    { name="userdel",  usage="userdel [-r] <user>",      desc="Delete a user account.", flags={
+        {"-r","Also remove the user's home directory"},
+    }},
+    { name="usermod",  usage="usermod [-l name] [-p pw] [-g gid] [-d home] [-s shell] [-LU] <user>", desc="Modify an existing user account.", flags={
+        {"-l name", "Rename the user"},
+        {"-p pw",   "Set new password"},
+        {"-g gid",  "Change primary group id"},
+        {"-d home", "Change home directory"},
+        {"-s shell","Change login shell"},
+        {"-L",      "Lock the account"},
+        {"-U",      "Unlock the account"},
+    }},
+    { name="passwd",   usage="passwd [username]",         desc="Change a user password.", flags={} },
+    { name="lsusers",  usage="lsusers",                  desc="List all user accounts with uid, gid, home, and shell.", flags={} },
+    { name="su",       usage="su [username]",             desc="Switch user. Defaults to root. Root can switch without a password.", flags={} },
+    { name="sudo",     usage="sudo [-u user] CMD [args...]", desc="Run a command as another user (default root).", flags={
+        {"-u user","Run as the specified user (name or uid)"},
+    }},
+    { name="exit",     usage="exit [N]",                 desc="Exit the shell with optional status code N.", flags={} },
+    { name="clear",    usage="clear",                    desc="Clear the terminal screen.", flags={} },
+    { name="help",     usage="help [command]",            desc="Display this command reference. Pass a command name to filter.", flags={} },
+    { name="lua",      usage="lua",                      desc="Interactive Lua REPL prompt.", flags={} },
+    { name="micro",    usage="micro [file]",              desc="Full-screen terminal text editor.", flags={} },
+    { name="hfetch",   usage="hfetch",                   desc="Display system information in a neofetch-style layout.", flags={} },
+    { name="sysdump",  usage="sysdump",                  desc="List all registered kernel syscalls.", flags={} },
+    { name="chroot",   usage="chroot DIR [CMD]",          desc="Run a command with a different root directory.", flags={} },
+}
+
+do
+    local seen = {}
+    local deduped = {}
+    for _, cmd in ipairs(COMMANDS) do
+        if not seen[cmd.name] then
+            seen[cmd.name] = true
+            table.insert(deduped, cmd)
+        end
+    end
+    COMMANDS = deduped
+end
+
+local C_HEAD  = 7
+local C_CMD   = 5
+local C_USAGE = 1
+local C_DESC  = 13
+local C_FLAG  = 3
+local C_DIM   = 12
+
+local lines = {}
+local function push(text, col) lines[#lines+1] = {text, col or 1} end
+
+push("HyperionOS Command Reference", C_HEAD)
+push(string.rep("=", 50), C_DIM)
+push("", 1)
+
+local args = {...}
+local filter = args[1]
+
+local function addCmd(cmd)
+    push(cmd.name, C_CMD)
+    push("  Usage: " .. cmd.usage, C_USAGE)
+    push("  " .. cmd.desc, C_DESC)
+    if #cmd.flags > 0 then
+        for _, f in ipairs(cmd.flags) do
+            push("    " .. f[1], C_FLAG)
+            push("        " .. f[2], C_DESC)
+        end
+    end
+    push("", 1)
+end
+
+if filter then
+    local found = false
+    for _, cmd in ipairs(COMMANDS) do
+        if cmd.name == filter then addCmd(cmd); found = true; break end
+    end
+    if not found then
+        push("help: unknown command '" .. filter .. "'", 2)
+        push("Run 'help' with no arguments for the full list.", C_DESC)
+    end
+else
+    push("Run 'help <command>' for details on a specific command.", C_DESC)
+    push("", 1)
+    for _, cmd in ipairs(COMMANDS) do addCmd(cmd) end
+end
+
+local sizeStr = syscall.devctl(1, "size")
+local screenW = tonumber(sizeStr:match("^(%d+)")) or 51
+local screenH = tonumber(sizeStr:match(";(%d+)")) or 19
+local pageSize = screenH - 2
+
+local scroll = 0
+local totalLines = #lines
+local dirty = true
+
+local function render()
+    syscall.devctl(1, "clear")
+    syscall.devctl(1, "spos", 1, 1)
+    for row = 1, pageSize do
+        local li = scroll + row
+        if li <= totalLines then
+            local text, col = lines[li][1], lines[li][2]
+            syscall.devctl(1, "sfgc", col)
+            if #text > screenW then text = text:sub(1, screenW) end
+            syscall.write(1, text .. "\n")
+        else
+            syscall.write(1, "\n")
+        end
+    end
+    syscall.devctl(1, "sfgc", 16)
+    syscall.devctl(1, "sbgc", 13)
+    local pct = math.floor(math.min(100, (scroll + pageSize) / totalLines * 100))
+    local status = string.format(" help -- line %d/%d (%d%%)  [up/down: scroll  q: quit] ",
+        scroll + 1, totalLines, pct)
+    if #status > screenW then status = status:sub(1, screenW) end
+    syscall.devctl(1, "spos", 1, screenH)
+    syscall.write(1, status .. string.rep(" ", screenW - #status))
+    syscall.devctl(1, "sfgc", 1)
+    syscall.devctl(1, "sbgc", 16)
+    dirty = false
+end
+
+if totalLines <= pageSize then
+    syscall.devctl(1, "clear")
+    syscall.devctl(1, "spos", 1, 1)
+    for _, line in ipairs(lines) do
+        syscall.devctl(1, "sfgc", line[2])
+        syscall.write(1, line[1] .. "\n")
+    end
+    syscall.devctl(1, "sfgc", 1)
+    return
+end
+
+render()
+while true do
+    local ch = syscall.read(0)
+    if not ch or ch == "" then
+    elseif ch == "q" or ch == "Q" then
+        break
+    elseif ch == "\17" then
+        if scroll > 0 then scroll = scroll - 1; dirty = true end
+    elseif ch == "\18" then
+        if scroll + pageSize < totalLines then scroll = scroll + 1; dirty = true end
+    elseif ch == "\19" then
+        scroll = math.max(0, scroll - pageSize); dirty = true
+    elseif ch == "\20" then
+        scroll = math.min(totalLines - pageSize, scroll + pageSize); dirty = true
+    end
+    if dirty then render() end
+end
+
+syscall.devctl(1, "clear")
+syscall.devctl(1, "spos", 1, 1)
+syscall.devctl(1, "sfgc", 1)
+syscall.devctl(1, "sbgc", 16)

Src/hysh/bin/hfetch

@@ -33,7 +33,6 @@ local host_str = syscall.getHost() or "Unknown"
 local cc_ver   = host_str:match("ComputerCraft ([%d%.]+)") or host_str
 
 local info = {
-    -- {label, value}  label=nil means print value as-is (userhost / separator)
     {nil,        userhost},
     {nil,        string.rep("-", #userhost)},
     {"OS",       syscall.version() or "Unknown"},
@@ -42,7 +41,7 @@ local info = {
     {"Uptime",   formatUptime(syscall.getUptime() or 0)},
     {"Tasks",    tostring(#(syscall.getTasks() or {}))},
     {"Shell",    syscall.getEnviron("SHELL") or "Unknown"},
-    {"Terminal", "TTY1"},
+    {"Terminal", "tty1"},
     {"UID",      tostring(syscall.getuid())},
     {"Packages", "n/a (spm)"},
 }
@@ -71,15 +70,12 @@ local lines = math.max(#logo, #info)
 for i = 1, lines do
     local logo_str = logo[i] or string.rep(" ", 36)
 
-    -- print logo segment in cyan
     c(C_LOGO)
     printInline(logo_str)
 
-    -- print separator pipe
     c(C_LABEL)
     printInline("| ")
 
-    -- print info segment
     local row = info[i]
     if row then
         if row[1] == nil and i == 1 then

Src/hysh/bin/id

@@ -3,7 +3,7 @@ local args = {...}
 local uid
 
 if args[1] then
-    uid = syscall.auth_getuid(args[1])
+    uid = syscall.getuid(args[1])
     if not uid then
         print("id: user '" .. args[1] .. "' does not exist")
         syscall.exit(1); return
@@ -12,7 +12,7 @@ else
     uid = syscall.getuid()
 end
 
-local pwent = syscall.auth_getpasswd(uid)
+local pwent = syscall.getpasswd(uid)
 local name = (pwent and pwent.username) or tostring(uid)
 local gid  = (pwent and pwent.gid) or uid
 

Src/hysh/bin/ll

@@ -0,0 +1,3 @@
+local args={...}
+table.insert(args, "-lah")
+syscall.exec("/bin/ls", args)

Src/hysh/bin/ln

@@ -0,0 +1,96 @@
+--:Minify:--
+local name = syscall.getTask(syscall.getpid()).name
+local cloptions = { s = false, f = false, help = false }
+local args = {}
+
+for _, v in ipairs({ ... }) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if cloptions[opt] == nil then
+            print(name .. ": unrecognized option '" .. v .. "'")
+            print("try '" .. name .. " --help' for more information.")
+            syscall.exit(1); return
+        end
+        cloptions[opt] = true
+    elseif v:sub(1, 1) == "-" then
+        for i = 2, #v do
+            local opt = v:sub(i, i)
+            if cloptions[opt] == nil then
+                print(name .. ": invalid option '-" .. opt .. "'")
+                print("try '" .. name .. " --help' for more information.")
+                syscall.exit(1); return
+            end
+            cloptions[opt] = true
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " [OPTION]... TARGET LINK_NAME")
+    print("       " .. name .. " [OPTION]... TARGET... DIRECTORY")
+    print("Create links between files.")
+    print("")
+    print("Options:")
+    print("  -s          make symbolic links instead of hard links")
+    print("  -f          remove existing destination files")
+    print("  --help      display this help and exit")
+    print("")
+    print("With no -s, hard links are not supported (filesystem limitation).")
+    print("Use -s for symbolic links.")
+    return
+end
+
+if #args < 2 then
+    print(name .. ": missing operand")
+    print("try '" .. name .. " --help' for more information.")
+    syscall.exit(1); return
+end
+
+if not cloptions.s then
+    print(name .. ": hard links are not supported; use -s for symbolic links")
+    syscall.exit(1); return
+end
+
+local dest    = args[#args]
+local destDir = syscall.type(dest) == "directory"
+
+local function cwd()
+    local d = syscall.getcwd()
+    if d:sub(-1) ~= "/" then d = d .. "/" end
+    return d
+end
+
+local function absPath(p)
+    if p:sub(1,1) ~= "/" then p = cwd() .. p end
+    return p
+end
+
+for i = 1, #args - 1 do
+    local target   = args[i]
+    local linkPath
+
+    if destDir then
+        local basename = target:match("[^/]+$") or target
+        linkPath = absPath(dest)
+        if linkPath:sub(-1) ~= "/" then linkPath = linkPath .. "/" end
+        linkPath = linkPath .. basename
+    else
+        linkPath = absPath(dest)
+    end
+
+    if cloptions.f and syscall.exists(linkPath) then
+        local ok, err = pcall(syscall.remove, linkPath)
+        if not ok then
+            print(name .. ": cannot remove '" .. linkPath .. "': " .. tostring(err))
+            syscall.exit(1); return
+        end
+    end
+
+    local ok, err = pcall(syscall.symlink, target, linkPath)
+    if not ok then
+        print(name .. ": failed to create symlink '" .. linkPath .. "' -> '" .. target .. "': " .. tostring(err))
+        syscall.exit(1); return
+    end
+end

Src/hysh/bin/login

@@ -1,9 +1,8 @@
 --:Minify:--
-syscall.open("/dev/tty/TTY1", "r") --stdin  (fd 0)
+syscall.open("/dev/tty/1", "r") --stdin  (fd 0)
-syscall.open("/dev/tty/TTY1", "w") --stdout (fd 1)
+syscall.open("/dev/tty/1", "w") --stdout (fd 1)
 syscall.open("/dev/null", "w")    --stderr (fd 2)
 
-local fs = require("sys.fs")
 
 local MAX_ATTEMPTS = 3
 
@@ -12,7 +11,6 @@ local function readLine(mask)
     while true do
         local ch = syscall.read(0)
         if not ch or ch == "" then
-            -- buffer empty, spin
         elseif ch == "\n" then
             syscall.write(1, "\n")
             return input
@@ -29,7 +27,12 @@ local function readLine(mask)
 end
 
 local function firstBoot()
-    local shadow = fs.readAllText("/etc/shadow") or ""
+    local shadow = ""
+    local _fd, _fderr = pcall(function()
+        local fd = syscall.open("/etc/shadow", "r")
+        shadow = syscall.read(fd, 65535) or ""
+        syscall.close(fd)
+    end)
     if shadow:match("%S") then return end
 
     syscall.devctl(1, "clear")
@@ -54,7 +57,7 @@ local function firstBoot()
             syscall.write(1, "Password too short (minimum 6 characters).\n\n")
             syscall.devctl(1, "sfgc", 1)
         else
-            local ok, err = syscall.auth_setpassword(0, pw1)
+            local ok, err = syscall.setpassword(0, pw1)
             if ok then
                 syscall.devctl(1, "sfgc", 3)
                 syscall.write(1, "Root password set.\n\n")
@@ -71,35 +74,39 @@ local function firstBoot()
 end
 
 local function spawnShell(username, uid, shell, homedir)
-    local shellText = fs.readAllText(shell)
+    local existsOk, existsErr = pcall(syscall.exists, shell)
-    if not shellText then
+    if not existsOk or not existsErr then
         syscall.write(1, "login: shell not found: " .. shell .. "\n")
         sleep(2)
         return false
     end
 
-    local errFifo = {}
+    local accessOk, accessErr = pcall(syscall.access, shell, "rx")
 
-    local proc = syscall.spawn(function()
-        syscall.setuid(uid)
-        syscall.chdir(homedir)
     syscall.setEnviron("HOME",  homedir)
     syscall.setEnviron("USER",  username)
     syscall.setEnviron("SHELL", shell)
     syscall.setEnviron("PATH",  "/bin/")
 
-        local shellFn, loadErr = load(shellText, "@" .. shell)
+    local setuidOk, setuidErr = pcall(syscall.setuid, uid)
-        if not shellFn then
+    if not setuidOk then
-            syscall.log("login: shell load error: " .. tostring(loadErr), "ERROR")
+        syscall.write(1, "login: setuid failed: " .. tostring(setuidErr) .. "\n")
-            syscall.exit(-1)
+        sleep(2)
-            return
+        return false
     end
 
-        local ok, runErr = xpcall(shellFn, debug.traceback)
+    local chdirOk, chdirErr = pcall(syscall.chdir, homedir)
-        if not ok then
+    if not chdirOk then
-            syscall.log("login: shell runtime error: " .. tostring(runErr), "ERROR")
+        pcall(syscall.chdir, "/")
     end
-    end, username .. ":shell")
+
+    local ok, err = pcall(syscall.execspawn, shell, username .. ":shell")
+    if not ok then
+        syscall.write(1, "login: failed to launch shell: " .. tostring(err) .. "\n")
+        sleep(2)
+        return false
+    end
+
     syscall.exit(0)
 end
 
@@ -123,11 +130,13 @@ local function doLogin()
 
         syscall.write(1, "Password: ")
         local password = readLine("*")
+        local uid = syscall.getuidbyname(username)
         
-        local ok, err = syscall.auth_login(username, password)
+        local ok, err = syscall.login(uid, password)
         if ok then
-            local uid     = syscall.auth_getuid(username)
+            local uid     = syscall.getuid()
-            local pwent   = uid and syscall.auth_getpasswd(uid)
+            local pwent   = syscall.getpasswd(uid)
+
             local shell   = (pwent and pwent.shell)   or "/bin/hysh"
             local homedir = (pwent and pwent.homedir) or "/"
 

Src/hysh/bin/loimgcreate

@@ -0,0 +1,157 @@
+--:Minify:--
+-- Usage:
+--   loimgcreate <srcdir> <image.hfs>    create image from directory
+--   loimgcreate -x <image.hfs> <dest>   extract image back to a directory
+--   loimgcreate --help
+
+local name = syscall.getTask(syscall.getpid()).name
+local args, opts = {}, { x=false, help=false }
+
+for _, v in ipairs({...}) do
+    if v:sub(1,2) == "--" then
+        local o = v:sub(3)
+        if o == "help" then opts.help = true
+        else print(name..": unrecognised option '"..v.."'")
+             print("try '"..name.." --help' for more information.")
+             syscall.exit(1); return end
+    elseif v:sub(1,1) == "-" then
+        for i = 2, #v do
+            local c = v:sub(i,i)
+            if opts[c] ~= nil then opts[c] = true
+            else print(name..": invalid option '-"..c.."'")
+                 print("try '"..name.." --help' for more information.")
+                 syscall.exit(1); return end
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if opts.help then
+    print("Usage: "..name.." <srcdir> <image.hfs>")
+    print("       "..name.." -x <image.hfs> <destdir>")
+    print("")
+    print("Pack a directory into a portable HFS image file, or extract one.")
+    print("")
+    print("  <srcdir> <image.hfs>     recursively pack srcdir into image.hfs")
+    print("  -x <image.hfs> <dest>    extract image.hfs into dest (created if needed)")
+    print("")
+    print("HFS images can be mounted with:")
+    print("  mount -o loop /path/to/image.hfs /mnt/point")
+    print("")
+    print("Requires root.")
+    return
+end
+
+local fs = require("fs")
+
+if opts.x then
+    if #args < 2 then
+        print(name..": -x requires <image.hfs> and <destdir>")
+        print("try '"..name.." --help' for more information.")
+        syscall.exit(1); return
+    end
+
+    local imgPath  = args[1]
+    local destPath = args[2]
+    if imgPath:sub(1,1)  ~= "/" then imgPath  = syscall.getcwd().."/"..imgPath  end
+    if destPath:sub(1,1) ~= "/" then destPath = syscall.getcwd().."/"..destPath end
+
+    local tmpMnt = "/tmp/._loimgcreate_"..tostring(math.random(100000,999999))
+
+    local ok1, loopId = pcall(syscall.losetup, imgPath, true)
+    if not ok1 then
+        print(name..": losetup: "..tostring(loopId)); syscall.exit(1); return
+    end
+
+    local ok2, merr = pcall(syscall.mount, tmpMnt, loopId)
+    if not ok2 then
+        pcall(syscall.lodetach, loopId)
+        print(name..": mount: "..tostring(merr)); syscall.exit(1); return
+    end
+
+    if not fs.isDir(destPath) then
+        local ok3, derr = pcall(syscall.mkdir, destPath)
+        if not ok3 then
+            pcall(syscall.umount, tmpMnt); pcall(syscall.lodetach, loopId)
+            print(name..": mkdir '"..args[2].."': "..tostring(derr))
+            syscall.exit(1); return
+        end
+    end
+
+    local count = 0
+    local function copyTree(src, dst)
+        local entries = fs.list(src)
+        if not entries then return end
+        for _, ent in ipairs(entries) do
+            local srcFull = src:gsub("/$","").."/"..ent
+            local dstFull = dst:gsub("/$","").."/"..ent
+            if fs.isDir(srcFull) then
+                pcall(syscall.mkdir, dstFull)
+                copyTree(srcFull, dstFull)
+            else
+                local ok, rfd = pcall(syscall.open, srcFull, "r")
+                if ok then
+                    local ok2, wfd = pcall(syscall.open, dstFull, "w")
+                    if ok2 then
+                        local ok3, data = pcall(syscall.read, rfd, 65536*16)
+                        if ok3 and data then pcall(syscall.write, wfd, data) end
+                        pcall(syscall.close, wfd)
+                        count = count + 1
+                    end
+                    pcall(syscall.close, rfd)
+                end
+            end
+        end
+    end
+
+    copyTree(tmpMnt, destPath)
+
+    pcall(syscall.umount, tmpMnt)
+    pcall(syscall.lodetach, loopId)
+
+    syscall.devctl(1, "sfgc", 10)
+    print(name..": extracted "..count.." file(s) to "..destPath)
+    syscall.devctl(1, "sfgc", 1)
+    return
+end
+
+if #args < 2 then
+    print(name..": missing operands — need <srcdir> and <image.hfs>")
+    print("try '"..name.." --help' for more information.")
+    syscall.exit(1); return
+end
+
+local srcPath  = args[1]
+local imgPath  = args[2]
+if srcPath:sub(1,1) ~= "/" then srcPath = syscall.getcwd().."/"..srcPath end
+if imgPath:sub(1,1) ~= "/" then imgPath = syscall.getcwd().."/"..imgPath end
+
+if not fs.isDir(srcPath) then
+    print(name..": '"..args[1].."': not a directory")
+    syscall.exit(1); return
+end
+
+local ok, imgStr = pcall(syscall.loimgcreate, srcPath)
+if not ok then
+    local msg = tostring(imgStr)
+    if msg:find("EPERM") then msg = "Permission denied"
+    elseif msg:find("ENOTDIR") then msg = "'"..args[1].."': not a directory" end
+    print(name..": "..msg); syscall.exit(1); return
+end
+
+local ok2, werr = pcall(syscall.loimgwrite, imgStr, imgPath)
+if not ok2 then
+    print(name..": write '"..args[2].."': "..tostring(werr))
+    syscall.exit(1); return
+end
+
+local lineCount = 0
+for _ in imgStr:gmatch("\n") do lineCount = lineCount + 1 end
+local byteCount = #imgStr
+
+syscall.devctl(1, "sfgc", 10)
+print(name..": image written to "..imgPath)
+syscall.devctl(1, "sfgc", 14)
+print(string.format("  %d records, %d bytes", lineCount - 1, byteCount))
+syscall.devctl(1, "sfgc", 1)

Src/hysh/bin/losetup

@@ -0,0 +1,129 @@
+--:Minify:--
+-- Usage:
+--   losetup <path>          attach directory or .hfs image; print loop id
+--   losetup -d <id>         detach loop device
+--   losetup -l              list attached loop devices
+--   losetup -i <path>       force image mode (even without .hfs extension)
+--   losetup --help
+
+local name = syscall.getTask(syscall.getpid()).name
+local args, opts = {}, { d=false, l=false, i=false, help=false }
+
+for _, v in ipairs({...}) do
+    if v:sub(1,2) == "--" then
+        local o = v:sub(3)
+        if o == "help" then opts.help = true
+        else print(name..": unrecognised option '"..v.."'")
+             print("try '"..name.." --help' for more information.")
+             syscall.exit(1); return end
+    elseif v:sub(1,1) == "-" then
+        for i = 2, #v do
+            local c = v:sub(i,i)
+            if opts[c] ~= nil then opts[c] = true
+            else print(name..": invalid option '-"..c.."'")
+                 print("try '"..name.." --help' for more information.")
+                 syscall.exit(1); return end
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if opts.help then
+    print("Usage: "..name.." <path>")
+    print("       "..name.." -i <path>")
+    print("       "..name.." -d <id>")
+    print("       "..name.." -l")
+    print("")
+    print("Manage loop devices.")
+    print("")
+    print("  <path>      attach a directory (bind) or .hfs image file")
+    print("  -i <path>   force image mode for the given file")
+    print("  -d <id>     detach loop device by id (must be unmounted first)")
+    print("  -l          list all currently attached loop devices")
+    print("")
+    print("Requires root. Loop device ids look like loop0, loop1, …")
+    return
+end
+
+if opts.l then
+    local ok, devs = pcall(syscall.lolist)
+    if not ok then
+        print(name..": "..tostring(devs)); syscall.exit(1); return
+    end
+    local any = false
+    local ids = {}
+    for id in pairs(devs) do ids[#ids+1] = id end
+    table.sort(ids)
+    for _, id in ipairs(ids) do
+        any = true
+        local info   = devs[id]
+        local mode   = (type(info) == "table" and info.mode) or "bind"
+        local path   = (type(info) == "table" and info.path) or tostring(info)
+        local colour = mode == "image" and 5 or 4
+        syscall.devctl(1, "sfgc", 3)
+        printInline(string.format("%-10s", id))
+        syscall.devctl(1, "sfgc", colour)
+        printInline(string.format("%-7s", "["..mode.."]"))
+        syscall.devctl(1, "sfgc", 1)
+        print(" "..path)
+    end
+    if not any then
+        syscall.devctl(1, "sfgc", 14)
+        print(name..": no loop devices attached")
+        syscall.devctl(1, "sfgc", 1)
+    end
+    return
+end
+
+if opts.d then
+    if #args < 1 then
+        print(name..": -d requires a loop device id")
+        print("try '"..name.." --help' for more information.")
+        syscall.exit(1); return
+    end
+    local id = args[1]
+    local ok, err = pcall(syscall.lodetach, id)
+    if not ok then
+        local msg = tostring(err)
+        if     msg:find("EPERM")  then msg = "Permission denied"
+        elseif msg:find("ENXIO")  then msg = "no such loop device '"..id.."'"
+        elseif msg:find("EBUSY")  then msg = "device '"..id.."' is still mounted, unmount first"
+        end
+        print(name..": "..msg); syscall.exit(1); return
+    end
+    syscall.devctl(1, "sfgc", 10)
+    print(name..": detached "..id)
+    syscall.devctl(1, "sfgc", 1)
+    return
+end
+
+if #args < 1 then
+    print(name..": missing path operand")
+    print("try '"..name.." --help' for more information.")
+    syscall.exit(1); return
+end
+
+local path = args[1]
+if path:sub(1,1) ~= "/" then
+    path = syscall.getcwd().."/"..path
+end
+
+local ftype = syscall.type and syscall.type(path)
+if not (ftype == "file" or ftype == "directory") then
+    print(name..": '"..args[1].."': no such file or directory")
+    syscall.exit(1); return
+end
+
+local ok, result = pcall(syscall.losetup, path, opts.i or nil)
+if not ok then
+    local msg = tostring(result)
+    if     msg:find("EPERM")   then msg = "Permission denied"
+    elseif msg:find("ENOENT")  then msg = "'"..args[1].."': no such file"
+    elseif msg:find("EINVAL")  then msg = "'"..args[1].."': not a directory or .hfs image"
+    elseif msg:find("EIO")     then msg = "'"..args[1].."': I/O error reading image"
+    end
+    print(name..": "..msg); syscall.exit(1); return
+end
+
+print(result)

Src/hysh/bin/ls

@@ -0,0 +1,193 @@
+--:Minify:--
+local cloptions = {
+    a    = false,
+    h    = false,
+    l    = false,
+    help = false,
+}
+local inpArgs = { ... }
+local args    = {}
+local name    = syscall.getTask(syscall.getpid()).name
+
+for _, v in pairs(inpArgs) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if cloptions[opt] == nil then
+            print(name .. ": unrecognized option '" .. v .. "'.")
+            print("try '" .. name .. " --help' for more information.")
+            return
+        end
+        cloptions[opt] = true
+    elseif v:sub(1, 1) == "-" then
+        for i = 2, #v do
+            local opt = v:sub(i, i)
+            if cloptions[opt] == nil then
+                print(name .. ": invalid option '-" .. opt .. "'.")
+                print("try '" .. name .. " --help' for more information.")
+                return
+            end
+            cloptions[opt] = true
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " [OPTION]... [DIR]")
+    print("List all entries in the specified DIRectory, or cwd if not specified.")
+    print("")
+    print("Options:")
+    print("  -a          do not ignore entries starting with .")
+    print("  -h          with -l, print sizes in human readable format")
+    print("  -l          use a long listing format")
+    print("  --help      display this help and exit")
+    return
+end
+
+local fs  = require("fs")
+local dir = args[1] or ""
+if dir:sub(1, 1) ~= "/" then
+    dir = syscall.getcwd() .. "/" .. dir
+end
+if dir:sub(-1) ~= "/" then dir = dir .. "/" end
+
+if not fs.isDir(dir) then
+    print(name .. ": cannot access '" .. (args[1] or dir) .. "': no such directory")
+    return
+end
+
+local function permStr(perms, etype)
+    local function b(n) return math.floor(perms / (2^n)) % 2 == 1 end
+    local t
+    if etype == 0x01 then t = "l"
+    elseif etype == nil then t = "-"
+    else t = "-" end
+
+    local ur = b(5) and "r" or "-"
+    local uw = b(4) and "w" or "-"
+    local ux = b(9) and (b(6) and "s" or "x") or (b(6) and "S" or "-")
+    local gr = b(3) and "r" or "-"
+    local gw = b(2) and "w" or "-"
+    local gx = b(8) and "x" or "-"
+    local wr = b(1) and "r" or "-"
+    local ww = b(0) and "w" or "-"
+    local wx = b(7) and "x" or "-"
+
+    return t .. ur .. uw .. ux .. gr .. gw .. gx .. wr .. ww .. wx
+end
+
+local sizePrefixes = { "K", "M", "G", "T" }
+local function humanSize(size)
+    local scale = 0
+    while size >= 1024 and scale < #sizePrefixes do
+        size  = size / 1024
+        scale = scale + 1
+    end
+    if scale == 0 then return tostring(size).."B" end
+    if size < 10 then
+        return string.format("%.1f%s", size, sizePrefixes[scale])
+    end
+    return math.floor(size) .. sizePrefixes[scale]
+end
+
+local screenSizeStr = syscall.devctl(1, "size")
+local sizeX = tonumber(screenSizeStr:match("^(%d+)")) or 80
+
+local list = fs.list(dir)
+if not cloptions.a then
+    for i = #list, 1, -1 do
+        if list[i]:sub(1, 1) == "." then table.remove(list, i) end
+    end
+end
+table.sort(list)
+
+if #list == 0 then return end
+
+if cloptions.l then
+    for _, v in ipairs(list) do
+        local fullPath = dir .. v
+        local stat = syscall.lstat and syscall.lstat(fullPath) or syscall.stat(fullPath)
+        local isDir  = fs.isDir(fullPath)
+        local isSym  = stat and stat.etype == 0x01
+
+        local typeChar
+        if isSym    then typeChar = "l"
+        elseif isDir then typeChar = "d"
+        else              typeChar = "-" end
+
+        local pstr
+        if stat and stat.perms then
+            pstr = permStr(stat.perms, stat.etype)
+        else
+            pstr = typeChar .. "---------"
+        end
+
+        local size = (stat and stat.size) or 0
+        local sizeStr = cloptions.h and humanSize(size) or tostring(size)
+
+        local mtime = (stat and stat.modified) and math.floor(stat.modified / 1000) or 0
+
+        local owner = (stat and tostring(stat.owner)) or "0"
+        local group = (stat and tostring(stat.group)) or "0"
+
+        printInline(pstr .. " " .. owner .. " " .. group .. " ")
+        printInline(string.format("%6s", sizeStr) .. " ")
+        printInline(tostring(mtime) .. " ")
+
+        if isSym then
+            syscall.devctl(1, "sfgc", 6)
+            printInline(v)
+            syscall.devctl(1, "sfgc", 1)
+            local ok, target = pcall(syscall.readlink, fullPath)
+            if ok then
+                printInline(" -> ")
+                local targetExists = pcall(syscall.stat, fullPath)
+                syscall.devctl(1, "sfgc", targetExists and 6 or 2)
+                printInline(target)
+                syscall.devctl(1, "sfgc", 1)
+            end
+        elseif isDir then
+            syscall.devctl(1, "sfgc", 14)
+            printInline(v)
+            syscall.devctl(1, "sfgc", 1)
+        else
+            local isExec = stat and stat.perms and (math.floor(stat.perms / (2^9)) % 2 == 1)
+            syscall.devctl(1, "sfgc", isExec and 3 or 1)
+            printInline(v)
+            syscall.devctl(1, "sfgc", 1)
+        end
+        print("")
+    end
+    return
+end
+
+local colWidth = 0
+for _, v in ipairs(list) do
+    if #v + 2 > colWidth then colWidth = #v + 2 end
+end
+local numCols = math.max(1, math.floor(sizeX / colWidth))
+
+for i, v in ipairs(list) do
+    local fullPath = dir .. v
+    local isDir    = fs.isDir(fullPath)
+    local stat     = syscall.lstat and syscall.lstat(fullPath) or syscall.stat(fullPath)
+    local isSym    = stat and stat.etype == 0x01
+
+    if isSym then
+        syscall.devctl(1, "sfgc", 6)
+    elseif isDir then
+        syscall.devctl(1, "sfgc", 14)
+    else
+        local isExec = stat and stat.perms and (math.floor(stat.perms / (2^9)) % 2 == 1)
+        syscall.devctl(1, "sfgc", isExec and 3 or 1)
+    end
+
+    printInline(v)
+    syscall.devctl(1, "sfgc", 1)
+    printInline((" "):rep(colWidth - #v))
+
+    if i % numCols == 0 then print("") end
+end
+
+if #list % numCols ~= 0 then print("") end

Src/hysh/bin/lsusers

@@ -1,5 +1,5 @@
 --:Minify:--
-local users = syscall.auth_listusers()
+local users = syscall.listusers()
 if not users or #users == 0 then
     print("No users found.")
     return

Src/hysh/bin/mount

@@ -0,0 +1,152 @@
+--:Minify:--
+-- Usage:
+--   mount                       list all current mounts
+--   mount <id> <mountpoint>     mount loop device id at mountpoint
+--   mount -o loop <src> <dest>  attach <src> as loop device and mount at <dest>
+--   mount --help
+
+local name = syscall.getTask(syscall.getpid()).name
+local args, opts = {}, { help=false, o=nil }
+
+local i = 1
+local rawArgs = {...}
+while i <= #rawArgs do
+    local v = rawArgs[i]
+    if v:sub(1,2) == "--" then
+        local o = v:sub(3)
+        if o == "help" then opts.help = true
+        else print(name..": unrecognised option '"..v.."'")
+             print("try '"..name.." --help' for more information.")
+             syscall.exit(1); return end
+    elseif v == "-o" then
+        i = i + 1
+        opts.o = rawArgs[i]
+    elseif v:sub(1,1) == "-" then
+        local rest = v:sub(2)
+        if rest:sub(1,1) == "o" then
+            if #rest > 1 then opts.o = rest:sub(2)
+            else i = i + 1; opts.o = rawArgs[i] end
+        else
+            print(name..": invalid option '"..v.."'")
+            print("try '"..name.." --help' for more information.")
+            syscall.exit(1); return
+        end
+    else
+        table.insert(args, v)
+    end
+    i = i + 1
+end
+
+if opts.help then
+    print("Usage: "..name)
+    print("       "..name.." <id> <mountpoint>")
+    print("       "..name.." -o loop <source> <mountpoint>")
+    print("")
+    print("Mount a loop device or filesystem.")
+    print("")
+    print("  (no args)               list all active mount points")
+    print("  <id> <mountpoint>       mount an already-attached loop device")
+    print("  -o loop <src> <dest>    attach src as loop device and mount at dest")
+    print("                          src can be a directory (bind) or .hfs image")
+    print("")
+    print("Requires root for all operations except listing.")
+    return
+end
+
+if #args == 0 and not opts.o then
+    local ok, mounts = pcall(syscall.mounts or function()
+        error("ENOSYS")
+    end)
+
+    local loDevs = {}
+    local lok, ld = pcall(syscall.lolist)
+    if lok then
+        for id, info in pairs(ld) do
+            local path = (type(info)=="table" and info.path) or tostring(info)
+            local mode = (type(info)=="table" and info.mode) or "bind"
+            loDevs[id] = { path=path, mode=mode }
+        end
+    end
+
+    if next(loDevs) == nil then
+        syscall.devctl(1, "sfgc", 14)
+        print("(no loop devices attached)")
+        syscall.devctl(1, "sfgc", 1)
+        return
+    end
+
+    for id, info in pairs(loDevs) do
+        local colour = info.mode == "image" and 5 or 4
+        syscall.devctl(1, "sfgc", colour)
+        printInline(info.mode.." "..id)
+        syscall.devctl(1, "sfgc", 1)
+        print(" on "..info.path)
+    end
+    return
+end
+
+if opts.o and opts.o:lower() == "loop" then
+    if #args < 2 then
+        print(name..": -o loop requires <source> and <mountpoint>")
+        print("try '"..name.." --help' for more information.")
+        syscall.exit(1); return
+    end
+
+    local src   = args[1]
+    local dest  = args[2]
+
+    if src:sub(1,1) ~= "/" then src = syscall.getcwd().."/"..src end
+    if dest:sub(1,1) ~= "/" then dest = syscall.getcwd().."/"..dest end
+
+    local ok, loopId = pcall(syscall.losetup, src)
+    if not ok then
+        local msg = tostring(loopId)
+        if msg:find("EPERM")  then msg = "Permission denied"
+        elseif msg:find("EINVAL") then msg = "'"..args[1].."': not a directory or .hfs image"
+        elseif msg:find("EIO")    then msg = "'"..args[1].."': I/O error reading image"
+        end
+        print(name..": losetup: "..msg); syscall.exit(1); return
+    end
+
+    local ok2, merr = pcall(syscall.mount, dest, loopId)
+    if not ok2 then
+        pcall(syscall.lodetach, loopId)
+        local msg = tostring(merr)
+        if msg:find("EPERM")  then msg = "Permission denied"
+        elseif msg:find("EBUSY") then msg = "'"..dest.."' is already a mount point"
+        elseif msg:find("ENODEV") then msg = "loop device not found (internal error)"
+        end
+        print(name..": mount: "..msg); syscall.exit(1); return
+    end
+
+    syscall.devctl(1, "sfgc", 10)
+    print(name..": "..loopId.." mounted at "..dest)
+    syscall.devctl(1, "sfgc", 1)
+    return
+end
+
+if #args == 2 then
+    local loopId = args[1]
+    local dest   = args[2]
+    if dest:sub(1,1) ~= "/" then dest = syscall.getcwd().."/"..dest end
+
+    local ok, err = pcall(syscall.mount, dest, loopId)
+    if not ok then
+        local msg = tostring(err)
+        if msg:find("EPERM")  then msg = "Permission denied"
+        elseif msg:find("ENODEV") then msg = "'"..loopId.."': no such device - use losetup first"
+        elseif msg:find("EBUSY")  then msg = "'"..dest.."' is already a mount point"
+        elseif msg:find("EINVAL") then msg = "invalid arguments"
+        end
+        print(name..": "..msg); syscall.exit(1); return
+    end
+
+    syscall.devctl(1, "sfgc", 10)
+    print(name..": "..loopId.." mounted at "..dest)
+    syscall.devctl(1, "sfgc", 1)
+    return
+end
+
+print(name..": wrong number of arguments")
+print("try '"..name.." --help' for more information.")
+syscall.exit(1)

Src/hysh/bin/passwd

@@ -9,7 +9,7 @@ local currentUid = syscall.getuid()
 
 local targetUid
 if targetName then
-    targetUid = syscall.auth_getuid(targetName)
+    targetUid = syscall.getuid()
     if not targetUid then
         print("passwd: user '" .. targetName .. "' does not exist")
         syscall.exit(1); return
@@ -36,7 +36,7 @@ if currentUid ~= 0 then
             if #cur > 0 then cur=cur:sub(1,-2); syscall.write(1,"\b \b") end
         else cur=cur..ch; syscall.write(1,"*") end
     end
-    local ok, err = syscall.auth_elevate(targetName, cur)
+    local ok, err = syscall.login(targetUid, cur)
     if not ok then
         sleep(1)
         print("passwd: authentication failure")
@@ -71,7 +71,7 @@ if pw1 ~= pw2 then
     syscall.exit(1); return
 end
 
-local ok, err = syscall.auth_setpassword(targetUid, pw1)
+local ok, err = syscall.setpassword(targetUid, pw1)
 if not ok then
     print("passwd: " .. tostring(err))
     syscall.exit(1); return

Src/hysh/bin/ps

@@ -1,3 +1,4 @@
+--:Minify:--
 for i,v in ipairs(syscall.getTasks()) do
     local task = syscall.getTask(v)
     print(task.pid,task.username,task.name,task.status)

Src/hysh/bin/readlink

@@ -0,0 +1,82 @@
+--:Minify:--
+local name = syscall.getTask(syscall.getpid()).name
+local cloptions = { n = false, f = false, e = false, help = false }
+local args = {}
+
+for _, v in ipairs({ ... }) do
+    if v:sub(1, 2) == "--" then
+        local opt = v:sub(3)
+        if cloptions[opt] == nil then
+            print(name .. ": unrecognized option '" .. v .. "'")
+            syscall.exit(1); return
+        end
+        cloptions[opt] = true
+    elseif v:sub(1, 1) == "-" then
+        for i = 2, #v do
+            local opt = v:sub(i, i)
+            if cloptions[opt] == nil then
+                print(name .. ": invalid option '-" .. opt .. "'")
+                syscall.exit(1); return
+            end
+            cloptions[opt] = true
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if cloptions.help then
+    print("Usage: " .. name .. " [OPTION]... FILE...")
+    print("Print the resolved target of symbolic links.")
+    print("")
+    print("Options:")
+    print("  -f          canonicalize: follow every symlink; last component need not exist")
+    print("  -e          like -f but all components must exist")
+    print("  -n          do not output trailing newline")
+    print("  --help      display this help and exit")
+    return
+end
+
+if #args == 0 then
+    print(name .. ": missing operand")
+    print("try '" .. name .. " --help' for more information.")
+    syscall.exit(1); return
+end
+
+local function absPath(p)
+    if p:sub(1,1) ~= "/" then
+        local d = syscall.getcwd()
+        if d:sub(-1) ~= "/" then d = d .. "/" end
+        p = d .. p
+    end
+    return p
+end
+
+local anyErr = false
+for _, path in ipairs(args) do
+    path = absPath(path)
+
+    if cloptions.f or cloptions.e then
+        local ok, stat = pcall(syscall.stat, path)
+        if not ok then
+            if cloptions.e then
+                print(name .. ": " .. path .. ": " .. tostring(stat))
+                anyErr = true
+            else
+                if not cloptions.n then print(path) else printInline(path) end
+            end
+        else
+            if not cloptions.n then print(path) else printInline(path) end
+        end
+    else
+        local ok, target = pcall(syscall.readlink, path)
+        if not ok then
+            print(name .. ": " .. path .. ": " .. tostring(target))
+            anyErr = true
+        else
+            if not cloptions.n then print(target) else printInline(target) end
+        end
+    end
+end
+
+if anyErr then syscall.exit(1) end

Src/hysh/bin/su

@@ -0,0 +1,62 @@
+--:Minify:--
+local targetUser = ({ ... })[1]
+local currentUid = syscall.getuid()
+local targetUid
+if targetUser then
+    targetUid = syscall.getuidbyname(targetUser)
+else
+    targetUid = 0
+end
+
+if not targetUid then
+    print("su: user '" .. targetUser .. "' does not exist")
+    syscall.exit(1)
+    return
+end
+
+if currentUid ~= 0 then
+    printInline("Password: ")
+    local pw = ""
+    while true do
+        local ch = syscall.read(0)
+        if not ch or ch == "" then
+        elseif ch == "\n" then
+            syscall.write(1, "\n")
+            break
+        elseif ch == "\b" then
+            if #pw > 0 then pw = pw:sub(1, -2); syscall.write(1, "\b \b") end
+        else
+            pw = pw .. ch; syscall.write(1, "*")
+        end
+    end
+
+    local ok, err = syscall.login(targetUid, pw)
+    if not ok then
+        sleep(1)
+        print("su: Authentication failure")
+        syscall.exit(1)
+        return
+    end
+else
+    syscall.setuid(targetUid)
+end
+
+local pwent   = syscall.getpasswd(targetUid)
+local shell   = (pwent and pwent.shell)   or "/bin/hysh"
+local homedir = (pwent and pwent.homedir) or "/"
+local username= (pwent and pwent.username)or "Unknown"
+
+local ok_cd, err_cd = pcall(syscall.chdir, homedir)
+if not ok_cd then
+    homedir = "/"
+    syscall.chdir(homedir)
+end
+syscall.setEnviron("HOME",  homedir)
+syscall.setEnviron("USER",  username)
+syscall.setEnviron("SHELL", shell)
+
+local ok, err = pcall(syscall.exec, shell)
+if not ok then
+    print("su: cannot exec shell '" .. shell .. "': " .. tostring(err))
+    syscall.exit(1)
+end

Src/hysh/bin/sudo

@@ -1,5 +1,5 @@
 --:Minify:--
-local fs = require("sys.fs")
+local fs = require("fs")
 
 local cmdArgs = {...}
 local targetUser = "root"
@@ -10,7 +10,7 @@ if cmdArgs[i] == "-u" then
     local uarg = cmdArgs[i] or "root"
     local numUid = tonumber(uarg)
     if numUid then
-        local pwent = syscall.auth_getpasswd(numUid)
+        local pwent = syscall.getpasswd(numUid)
         targetUser = (pwent and pwent.username) or uarg
     else
         targetUser = uarg
@@ -31,7 +31,7 @@ for j = i + 1, #cmdArgs do restArgs[#restArgs + 1] = cmdArgs[j] end
 local currentUid = syscall.getuid()
 local currentUser = syscall.getUsername(currentUid) or tostring(currentUid)
 
-local targetUid = syscall.auth_getuid(targetUser)
+local targetUid = syscall.getuidbyname(targetUser)
 if not targetUid then
     print("sudo: user '" .. targetUser .. "' does not exist")
     syscall.exit(1)
@@ -39,7 +39,7 @@ if not targetUid then
 end
 
 if currentUid ~= 0 then
-    printInline("[sudo] password for " .. currentUser .. ": ")
+    printInline("[sudo] password for root: ")
     local pw = ""
     while true do
         local ch = syscall.read(0)
@@ -55,7 +55,7 @@ if currentUid ~= 0 then
         end
     end
 
-    local ok, err = syscall.auth_elevate(currentUser, pw)
+    local ok, err = syscall.login(0, pw)
     if not ok then
         sleep(1)
         print("sudo: Authentication failure")
@@ -63,7 +63,7 @@ if currentUid ~= 0 then
         return
     end
 
-    if targetUid ~= 0 then
+    if targetUid ~= currentUid then
         syscall.setuid(targetUid)
     end
 else
@@ -97,7 +97,7 @@ if not program then
     return
 end
 
-local pwent = syscall.auth_getpasswd(targetUid)
+local pwent = syscall.getpasswd(targetUid)
 if pwent and pwent.homedir then
     syscall.setEnviron("HOME", pwent.homedir)
 end

Src/hysh/bin/sysdump

@@ -0,0 +1,10 @@
+--:Minify:--
+local path=...
+path=path or "/dev/tty/1"
+local syscalls=syscall.sysdump()
+local fd=syscall.open(path,"w")
+for i=1, #syscalls do
+    syscall.write(fd,syscalls[i].."\n")
+end
+syscall.write(fd,"Total # of syscalls: "..tostring(#syscalls))
+syscall.close(fd)

Src/hysh/bin/umount

@@ -0,0 +1,111 @@
+--:Minify:--
+-- Usage:
+--   umount <mountpoint>        unmount; auto-detach loop device if one is found
+--   umount -l <id>             detach loop device without unmounting (force)
+--   umount --no-detach <mpt>   unmount but leave loop device attached
+--   umount --help
+
+local name = syscall.getTask(syscall.getpid()).name
+local args, opts = {}, { l=false, ["no-detach"]=false, help=false }
+
+for _, v in ipairs({...}) do
+    if v:sub(1,2) == "--" then
+        local o = v:sub(3)
+        if opts[o] ~= nil then opts[o] = true
+        else print(name..": unrecognised option '"..v.."'")
+             print("try '"..name.." --help' for more information.")
+             syscall.exit(1); return end
+    elseif v:sub(1,1) == "-" then
+        for i = 2, #v do
+            local c = v:sub(i,i)
+            if opts[c] ~= nil then opts[c] = true
+            else print(name..": invalid option '-"..c.."'")
+                 print("try '"..name.." --help' for more information.")
+                 syscall.exit(1); return end
+        end
+    else
+        table.insert(args, v)
+    end
+end
+
+if opts.help then
+    print("Usage: "..name.." <mountpoint>")
+    print("       "..name.." --no-detach <mountpoint>")
+    print("       "..name.." -l <loopid>")
+    print("")
+    print("Unmount a filesystem mounted at <mountpoint>.")
+    print("")
+    print("  <mountpoint>          unmount and auto-detach any loop device")
+    print("  --no-detach           unmount but keep the loop device attached")
+    print("  -l <loopid>           forcibly detach a loop device (no unmount)")
+    print("")
+    print("Requires root.")
+    return
+end
+
+if opts.l then
+    if #args < 1 then
+        print(name..": -l requires a loop device id")
+        print("try '"..name.." --help' for more information.")
+        syscall.exit(1); return
+    end
+    local id = args[1]
+    local ok, err = pcall(syscall.lodetach, id)
+    if not ok then
+        local msg = tostring(err)
+        if msg:find("EPERM")  then msg = "Permission denied"
+        elseif msg:find("ENXIO")  then msg = "no such loop device '"..id.."'"
+        elseif msg:find("EBUSY")  then msg = "'"..id.."' is still mounted - unmount first or omit -l"
+        end
+        print(name..": "..msg); syscall.exit(1); return
+    end
+    syscall.devctl(1, "sfgc", 10)
+    print(name..": detached "..id)
+    syscall.devctl(1, "sfgc", 1)
+    return
+end
+
+if #args < 1 then
+    print(name..": missing mount point operand")
+    print("try '"..name.." --help' for more information.")
+    syscall.exit(1); return
+end
+
+local mpt = args[1]
+if mpt:sub(1,1) ~= "/" then mpt = syscall.getcwd().."/"..mpt end
+
+local loopIdToDetach = nil
+if not opts["no-detach"] then
+    local lok, devs = pcall(syscall.lolist)
+    if lok then
+        loopIdToDetach = {}
+        for id in pairs(devs) do
+            loopIdToDetach[#loopIdToDetach + 1] = id
+        end
+    end
+end
+
+local ok, err = pcall(syscall.umount, mpt)
+if not ok then
+    local msg = tostring(err)
+    if msg:find("EPERM")  then msg = "Permission denied"
+    elseif msg:find("EINVAL") then msg = "'"..args[1].."' is not a mount point"
+    elseif msg:find("EBUSY")  then msg = "'"..args[1].."' is busy - close open files first"
+    end
+    print(name..": "..msg); syscall.exit(1); return
+end
+
+syscall.devctl(1, "sfgc", 10)
+print(name..": unmounted "..mpt)
+syscall.devctl(1, "sfgc", 1)
+
+if loopIdToDetach then
+    for _, id in ipairs(loopIdToDetach) do
+        local dok = pcall(syscall.lodetach, id)
+        if dok then
+            syscall.devctl(1, "sfgc", 14)
+            print(name..": auto-detached "..id)
+            syscall.devctl(1, "sfgc", 1)
+        end
+    end
+end

Src/hysh/bin/useradd

@@ -48,7 +48,7 @@ if not password then
     end
 end
 
-local uid, err = syscall.auth_newuser(
+local uid, err = syscall.newuser(
     opt.username, password, opt.gid, opt.homedir, opt.shell or "/bin/hysh"
 )
 if not uid then

Src/hysh/bin/userdel

@@ -14,22 +14,22 @@ if not username then
     syscall.exit(1); return
 end
 
-local uid = syscall.auth_getuid(username)
+local uid = syscall.getuid(username)
 if not uid then
     print("userdel: user '" .. username .. "' does not exist")
     syscall.exit(1); return
 end
 
-local pwent = syscall.auth_getpasswd(uid)
+local pwent = syscall.getpasswd(uid)
 
-local ok, err = syscall.auth_deleteuser(uid)
+local ok, err = syscall.deleteuser(uid)
 if not ok then
     print("userdel: " .. tostring(err))
     syscall.exit(1); return
 end
 
 if removeHome and pwent and pwent.homedir then
-    local fs = require("sys.fs")
+    local fs = require("fs")
     local ok2, err2 = pcall(function()
         local function rmdir(path)
             for _, f in ipairs(fs.list(path) or {}) do

Src/hysh/bin/usermod

@@ -27,7 +27,7 @@ if opt.lock and opt.unlock then
     syscall.exit(1); return
 end
 
-local uid = syscall.auth_getuid(opt.username)
+local uid = syscall.getuid(opt.username)
 if not uid then
     print("usermod: user '" .. opt.username .. "' does not exist")
     syscall.exit(1); return
@@ -38,12 +38,12 @@ local function apply(fn, ...)
     if not ok then print("usermod: " .. tostring(err)); syscall.exit(1) end
 end
 
-if opt.newname  then apply(syscall.auth_setusername, uid, opt.newname) end
+if opt.newname  then apply(syscall.setusername, uid, opt.newname) end
-if opt.password then apply(syscall.auth_setpassword, uid, opt.password) end
+if opt.password then apply(syscall.setpassword, uid, opt.password) end
-if opt.gid      then apply(syscall.auth_setgid,      uid, opt.gid) end
+if opt.gid      then apply(syscall.setgid,      uid, opt.gid) end
-if opt.homedir  then apply(syscall.auth_sethomedir,  uid, opt.homedir) end
+if opt.homedir  then apply(syscall.sethomedir,  uid, opt.homedir) end
-if opt.shell    then apply(syscall.auth_setshell,     uid, opt.shell) end
+if opt.shell    then apply(syscall.setshell,     uid, opt.shell) end
-if opt.lock     then apply(syscall.auth_lockuser,     uid) end
+if opt.lock     then apply(syscall.lockuser,     uid) end
-if opt.unlock   then apply(syscall.auth_unlockuser,   uid) end
+if opt.unlock   then apply(syscall.unlockuser,   uid) end
 
 print("usermod: updated user '" .. opt.username .. "'")

Src/hysh/bin/yes

@@ -1,3 +1,4 @@
+--:Minify:--
 local args = {...}
 while true do
     if #args == 0 then

Src/iniparse/lib/iniparse

@@ -0,0 +1,38 @@
+local ini = {}
+
+function ini.parse(str)
+    local config = {}
+    local section = nil
+
+    for line in str:gmatch("[^\r\n]+") do
+        -- trim whitespace
+        line = line:match("^%s*(.-)%s*$")
+
+        -- skip empty lines and comments
+        if line ~= "" and not line:match("^[;#]") then
+            -- section
+            local sec = line:match("^%[(.-)%]$")
+            if sec then
+                section = sec
+                config[section] = config[section] or {}
+            else
+                -- key=value
+                local key, value = line:match("^(.-)=(.*)$")
+                if key then
+                    key = key:match("^%s*(.-)%s*$")
+                    value = value:match("^%s*(.-)%s*$")
+
+                    if section then
+                        config[section][key] = value
+                    else
+                        config[key] = value
+                    end
+                end
+            end
+        end
+    end
+
+    return config
+end
+
+return ini

Src/json/lib/json

@@ -0,0 +1,388 @@
+--:Minify:--
+-- json.lua
+--
+-- Copyright (c) 2020 rxi
+--
+-- Permission is hereby granted, free of charge, to any person obtaining a copy of
+-- this software and associated documentation files (the "Software"), to deal in
+-- the Software without restriction, including without limitation the rights to
+-- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+-- of the Software, and to permit persons to whom the Software is furnished to do
+-- so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in all
+-- copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-- SOFTWARE.
+--
+
+local json = { _version = "0.1.2" }
+
+-------------------------------------------------------------------------------
+-- Encode
+-------------------------------------------------------------------------------
+
+local encode
+
+local escape_char_map = {
+  [ "\\" ] = "\\",
+  [ "\"" ] = "\"",
+  [ "\b" ] = "b",
+  [ "\f" ] = "f",
+  [ "\n" ] = "n",
+  [ "\r" ] = "r",
+  [ "\t" ] = "t",
+}
+
+local escape_char_map_inv = { [ "/" ] = "/" }
+for k, v in pairs(escape_char_map) do
+  escape_char_map_inv[v] = k
+end
+
+
+local function escape_char(c)
+  return "\\" .. (escape_char_map[c] or string.format("u%04x", c:byte()))
+end
+
+
+local function encode_nil(val)
+  return "null"
+end
+
+
+local function encode_table(val, stack)
+  local res = {}
+  stack = stack or {}
+
+  -- Circular reference?
+  if stack[val] then error("circular reference") end
+
+  stack[val] = true
+
+  if rawget(val, 1) ~= nil or next(val) == nil then
+    -- Treat as array -- check keys are valid and it is not sparse
+    local n = 0
+    for k in pairs(val) do
+      if type(k) ~= "number" then
+        error("invalid table: mixed or invalid key types")
+      end
+      n = n + 1
+    end
+    if n ~= #val then
+      error("invalid table: sparse array")
+    end
+    -- Encode
+    for i, v in ipairs(val) do
+      table.insert(res, encode(v, stack))
+    end
+    stack[val] = nil
+    return "[" .. table.concat(res, ",") .. "]"
+
+  else
+    -- Treat as an object
+    for k, v in pairs(val) do
+      if type(k) ~= "string" then
+        error("invalid table: mixed or invalid key types")
+      end
+      table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
+    end
+    stack[val] = nil
+    return "{" .. table.concat(res, ",") .. "}"
+  end
+end
+
+
+local function encode_string(val)
+  return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
+end
+
+
+local function encode_number(val)
+  -- Check for NaN, -inf and inf
+  if val ~= val or val <= -math.huge or val >= math.huge then
+    error("unexpected number value '" .. tostring(val) .. "'")
+  end
+  return string.format("%.14g", val)
+end
+
+
+local type_func_map = {
+  [ "nil"     ] = encode_nil,
+  [ "table"   ] = encode_table,
+  [ "string"  ] = encode_string,
+  [ "number"  ] = encode_number,
+  [ "boolean" ] = tostring,
+}
+
+
+encode = function(val, stack)
+  local t = type(val)
+  local f = type_func_map[t]
+  if f then
+    return f(val, stack)
+  end
+  error("unexpected type '" .. t .. "'")
+end
+
+
+function json.encode(val)
+  return ( encode(val) )
+end
+
+
+-------------------------------------------------------------------------------
+-- Decode
+-------------------------------------------------------------------------------
+
+local parse
+
+local function create_set(...)
+  local res = {}
+  for i = 1, select("#", ...) do
+    res[ select(i, ...) ] = true
+  end
+  return res
+end
+
+local space_chars   = create_set(" ", "\t", "\r", "\n")
+local delim_chars   = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
+local escape_chars  = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
+local literals      = create_set("true", "false", "null")
+
+local literal_map = {
+  [ "true"  ] = true,
+  [ "false" ] = false,
+  [ "null"  ] = nil,
+}
+
+
+local function next_char(str, idx, set, negate)
+  for i = idx, #str do
+    if set[str:sub(i, i)] ~= negate then
+      return i
+    end
+  end
+  return #str + 1
+end
+
+
+local function decode_error(str, idx, msg)
+  local line_count = 1
+  local col_count = 1
+  for i = 1, idx - 1 do
+    col_count = col_count + 1
+    if str:sub(i, i) == "\n" then
+      line_count = line_count + 1
+      col_count = 1
+    end
+  end
+  error( string.format("%s at line %d col %d", msg, line_count, col_count) )
+end
+
+
+local function codepoint_to_utf8(n)
+  -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa
+  local f = math.floor
+  if n <= 0x7f then
+    return string.char(n)
+  elseif n <= 0x7ff then
+    return string.char(f(n / 64) + 192, n % 64 + 128)
+  elseif n <= 0xffff then
+    return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128)
+  elseif n <= 0x10ffff then
+    return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128,
+                       f(n % 4096 / 64) + 128, n % 64 + 128)
+  end
+  error( string.format("invalid unicode codepoint '%x'", n) )
+end
+
+
+local function parse_unicode_escape(s)
+  local n1 = tonumber( s:sub(1, 4),  16 )
+  local n2 = tonumber( s:sub(7, 10), 16 )
+   -- Surrogate pair?
+  if n2 then
+    return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
+  else
+    return codepoint_to_utf8(n1)
+  end
+end
+
+
+local function parse_string(str, i)
+  local res = ""
+  local j = i + 1
+  local k = j
+
+  while j <= #str do
+    local x = str:byte(j)
+
+    if x < 32 then
+      decode_error(str, j, "control character in string")
+
+    elseif x == 92 then -- `\`: Escape
+      res = res .. str:sub(k, j - 1)
+      j = j + 1
+      local c = str:sub(j, j)
+      if c == "u" then
+        local hex = str:match("^[dD][89aAbB]%x%x\\u%x%x%x%x", j + 1)
+                 or str:match("^%x%x%x%x", j + 1)
+                 or decode_error(str, j - 1, "invalid unicode escape in string")
+        res = res .. parse_unicode_escape(hex)
+        j = j + #hex
+      else
+        if not escape_chars[c] then
+          decode_error(str, j - 1, "invalid escape char '" .. c .. "' in string")
+        end
+        res = res .. escape_char_map_inv[c]
+      end
+      k = j + 1
+
+    elseif x == 34 then -- `"`: End of string
+      res = res .. str:sub(k, j - 1)
+      return res, j + 1
+    end
+
+    j = j + 1
+  end
+
+  decode_error(str, i, "expected closing quote for string")
+end
+
+
+local function parse_number(str, i)
+  local x = next_char(str, i, delim_chars)
+  local s = str:sub(i, x - 1)
+  local n = tonumber(s)
+  if not n then
+    decode_error(str, i, "invalid number '" .. s .. "'")
+  end
+  return n, x
+end
+
+
+local function parse_literal(str, i)
+  local x = next_char(str, i, delim_chars)
+  local word = str:sub(i, x - 1)
+  if not literals[word] then
+    decode_error(str, i, "invalid literal '" .. word .. "'")
+  end
+  return literal_map[word], x
+end
+
+
+local function parse_array(str, i)
+  local res = {}
+  local n = 1
+  i = i + 1
+  while 1 do
+    local x
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of array?
+    if str:sub(i, i) == "]" then
+      i = i + 1
+      break
+    end
+    -- Read token
+    x, i = parse(str, i)
+    res[n] = x
+    n = n + 1
+    -- Next token
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "]" then break end
+    if chr ~= "," then decode_error(str, i, "expected ']' or ','") end
+  end
+  return res, i
+end
+
+
+local function parse_object(str, i)
+  local res = {}
+  i = i + 1
+  while 1 do
+    local key, val
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of object?
+    if str:sub(i, i) == "}" then
+      i = i + 1
+      break
+    end
+    -- Read key
+    if str:sub(i, i) ~= '"' then
+      decode_error(str, i, "expected string for key")
+    end
+    key, i = parse(str, i)
+    -- Read ':' delimiter
+    i = next_char(str, i, space_chars, true)
+    if str:sub(i, i) ~= ":" then
+      decode_error(str, i, "expected ':' after key")
+    end
+    i = next_char(str, i + 1, space_chars, true)
+    -- Read value
+    val, i = parse(str, i)
+    -- Set
+    res[key] = val
+    -- Next token
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "}" then break end
+    if chr ~= "," then decode_error(str, i, "expected '}' or ','") end
+  end
+  return res, i
+end
+
+
+local char_func_map = {
+  [ '"' ] = parse_string,
+  [ "0" ] = parse_number,
+  [ "1" ] = parse_number,
+  [ "2" ] = parse_number,
+  [ "3" ] = parse_number,
+  [ "4" ] = parse_number,
+  [ "5" ] = parse_number,
+  [ "6" ] = parse_number,
+  [ "7" ] = parse_number,
+  [ "8" ] = parse_number,
+  [ "9" ] = parse_number,
+  [ "-" ] = parse_number,
+  [ "t" ] = parse_literal,
+  [ "f" ] = parse_literal,
+  [ "n" ] = parse_literal,
+  [ "[" ] = parse_array,
+  [ "{" ] = parse_object,
+}
+
+
+parse = function(str, idx)
+  local chr = str:sub(idx, idx)
+  local f = char_func_map[chr]
+  if f then
+    return f(str, idx)
+  end
+  decode_error(str, idx, "unexpected character '" .. chr .. "'")
+end
+
+
+function json.decode(str)
+  if type(str) ~= "string" then
+    error("expected argument of type string, got " .. type(str))
+  end
+  local res, idx = parse(str, next_char(str, 1, space_chars, true))
+  idx = next_char(str, idx, space_chars, true)
+  if idx <= #str then
+    decode_error(str, idx, "trailing garbage")
+  end
+  return res
+end
+
+
+return json