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

Reviewed-on: #11

Src/Hyperion-kernel/boot/kernel.lua

@@ -130,18 +130,22 @@ if not initCfgStatus then
 end
 kernel.config = config
 
+local skip=false
 for i,v in ipairs(split(fstab,"\n")) do
     if v:sub(1,1)=="U" then
         local id=""
         for i=3,#v do
             if v:sub(i,i)==";" then
-                if i==3 then kernel.log("Invalid fstab line... Skipping.","WARN") goto endline end
+                if i==3 then kernel.log("Invalid fstab line... Skipping.","WARN") skip = true break end
                 id=v:sub(3,i-1)
             end
         end
-        local path=v:sub(#id+4)
-        ifs.mount(id,path)
-        ::endline::
+        if not skip then
+            local path=v:sub(#id+4)
+            ifs.mount(id,path)
+        else
+            skip=false
+        end
     end
 end
 kernel.log("Disks initialized")
@@ -265,15 +269,13 @@ for _,p in ipairs(modules) do
         if kernel.config.showModLoad then kernel.log("Loading module "..v, "DBUG", 5) end
         local code=ifs.readAllText(v)
         if not code then
-            kernel.log("ModuReadErr: "..v, "WARN", 8)
-            goto skip
+            kernel.panic("Failed to read module "..v)
         end
         local func,err=load(code,"@"..v)
-        if not func then kernel.panic("ModuLoadErr: "..tostring(err)) goto skip end
+        if not func then kernel.panic("ModuLoadErr: "..tostring(err)) end
         local status, err = xpcall(func,debug.traceback, kernel)
         if not status then kernel.panic("ModuRunErr: "..tostring(err)) end
         if kernel.config.showModLoad then kernel.log("Loaded module "..v, "DBUG", 5) end
-        ::skip::
     end
 end
 

Src/hysh/bin/login

@@ -126,36 +126,35 @@ local function doLogin()
         syscall.write(1, "Username: ")
         local username = readLine(nil)
 
-        if username == "" then goto continue end
+        if username ~= "" then
 
-        syscall.write(1, "Password: ")
-        local password = readLine("*")
-        local uid = syscall.getuidbyname(username)
+            syscall.write(1, "Password: ")
+            local password = readLine("*")
+            local uid = syscall.getuidbyname(username)
 
-        local ok, err = syscall.login(uid, password)
-        if ok then
-            local uid     = syscall.getuid()
-            local pwent   = syscall.getpasswd(uid)
+            local ok, err = syscall.login(uid, password)
+            if ok then
+                local uid     = syscall.getuid()
+                local pwent   = syscall.getpasswd(uid)
 
-            local shell   = (pwent and pwent.shell)   or "/bin/hysh"
-            local homedir = (pwent and pwent.homedir) or "/"
+                local shell   = (pwent and pwent.shell)   or "/bin/hysh"
+                local homedir = (pwent and pwent.homedir) or "/"
 
-            syscall.devctl(1, "sfgc", 3)
-            syscall.write(1, "\nWelcome, " .. username .. "!\n")
-            syscall.devctl(1, "sfgc", 1)
-            sleep(0.3)
+                syscall.devctl(1, "sfgc", 3)
+                syscall.write(1, "\nWelcome, " .. username .. "!\n")
+                syscall.devctl(1, "sfgc", 1)
+                sleep(0.3)
 
-            spawnShell(username, uid, shell, homedir)
-            return -- back to login prompt
-        else
-            attempts = attempts + 1
-            sleep(1)
-            syscall.devctl(1, "sfgc", 2)
-            syscall.write(1, "Login incorrect.\n\n")
-            syscall.devctl(1, "sfgc", 1)
+                spawnShell(username, uid, shell, homedir)
+                return -- back to login prompt
+            else
+                attempts = attempts + 1
+                sleep(1)
+                syscall.devctl(1, "sfgc", 2)
+                syscall.write(1, "Login incorrect.\n\n")
+                syscall.devctl(1, "sfgc", 1)
+            end
         end
-
-        ::continue::
     end
 
     syscall.devctl(1, "sfgc", 2)

Src/lua/bin/lua

@@ -308,16 +308,16 @@ local history = {}
 
 while true do
     local code = getUserInput("lua> ", history)
-    if code == "" then goto continue end
+    if code ~= "" then
 
-    while isIncomplete(code) do
-        code = code .. "\n" .. getUserInput("...  ", nil)
+        while isIncomplete(code) do
+            code = code .. "\n" .. getUserInput("...  ", nil)
+        end
+
+        if code ~= history[#history] then
+            history[#history+1] = code
+        end
+
+        runCode(code)
     end
-
-    if code ~= history[#history] then
-        history[#history+1] = code
-    end
-
-    runCode(code)
-    ::continue::
 end

Src/sed/bin/sed

@@ -139,72 +139,68 @@ local function parseCommands(src)
         local c = src:sub(pos, pos)
         if c == "\n" or c == ";" then
             pos = pos + 1
-            goto continue
-        end
-        if c == "#" then
+        elseif c == "#" then
             while pos <= len and src:sub(pos,pos) ~= "\n" do pos = pos + 1 end
-            goto continue
-        end
-
-        local addr1, addr2
-        addr1, pos = parseAddr(src, pos)
-        skip()
-        if addr1 and pos <= len and src:sub(pos,pos) == "," then
-            pos = pos + 1
-            skip()
-            addr2, pos = parseAddr(src, pos)
-        end
-        skip()
-
-        if pos > len then break end
-        local cmd = src:sub(pos, pos)
-        pos = pos + 1
-
-        if cmd == "s" then
-            local delim = src:sub(pos, pos); pos = pos + 1
-            local pat,  p1 = parseDelim(src, pos, delim);    pos = p1
-            local repl, p2 = parseDelim(src, pos, delim);    pos = p2
-            local flags = ""
-            while pos <= len and src:sub(pos,pos):match("[giIp]") do
-                flags = flags .. src:sub(pos,pos); pos = pos + 1
-            end
-            table.insert(cmds, { addr1=addr1, addr2=addr2, cmd="s",
-                pat=pat, repl=repl, flags=flags })
-
-        elseif cmd == "y" then
-            local delim = src:sub(pos, pos); pos = pos + 1
-            local srcch, p1 = parseDelim(src, pos, delim); pos = p1
-            local dstch, p2 = parseDelim(src, pos, delim); pos = p2
-            table.insert(cmds, { addr1=addr1, addr2=addr2, cmd="y",
-                src=srcch, dst=dstch })
-
-        elseif cmd == "d" or cmd == "p" or cmd == "q" or cmd == "=" then
-            table.insert(cmds, { addr1=addr1, addr2=addr2, cmd=cmd })
-
-        elseif cmd == "{" then
-            local depth = 1
-            local start = pos
-            while pos <= len and depth > 0 do
-                local ch = src:sub(pos,pos)
-                if ch == "{" then depth = depth + 1
-                elseif ch == "}" then depth = depth - 1 end
-                pos = pos + 1
-            end
-            local inner = src:sub(start, pos - 2)
-            local innerCmds = parseCommands(inner)
-            for _, ic in ipairs(innerCmds) do
-                ic.addr1 = ic.addr1 or addr1
-                ic.addr2 = ic.addr2 or addr2
-            end
-            for _, ic in ipairs(innerCmds) do
-                table.insert(cmds, ic)
-            end
-
-        elseif cmd == "\n" or cmd == ";" then
         else
-        end
 
-        ::continue::
+            local addr1, addr2
+            addr1, pos = parseAddr(src, pos)
+            skip()
+            if addr1 and pos <= len and src:sub(pos,pos) == "," then
+                pos = pos + 1
+                skip()
+                addr2, pos = parseAddr(src, pos)
+            end
+            skip()
+
+            if pos > len then break end
+            local cmd = src:sub(pos, pos)
+            pos = pos + 1
+
+            if cmd == "s" then
+                local delim = src:sub(pos, pos); pos = pos + 1
+                local pat,  p1 = parseDelim(src, pos, delim);    pos = p1
+                local repl, p2 = parseDelim(src, pos, delim);    pos = p2
+                local flags = ""
+                while pos <= len and src:sub(pos,pos):match("[giIp]") do
+                    flags = flags .. src:sub(pos,pos); pos = pos + 1
+                end
+                table.insert(cmds, { addr1=addr1, addr2=addr2, cmd="s",
+                    pat=pat, repl=repl, flags=flags })
+
+            elseif cmd == "y" then
+                local delim = src:sub(pos, pos); pos = pos + 1
+                local srcch, p1 = parseDelim(src, pos, delim); pos = p1
+                local dstch, p2 = parseDelim(src, pos, delim); pos = p2
+                table.insert(cmds, { addr1=addr1, addr2=addr2, cmd="y",
+                    src=srcch, dst=dstch })
+
+            elseif cmd == "d" or cmd == "p" or cmd == "q" or cmd == "=" then
+                table.insert(cmds, { addr1=addr1, addr2=addr2, cmd=cmd })
+
+            elseif cmd == "{" then
+                local depth = 1
+                local start = pos
+                while pos <= len and depth > 0 do
+                    local ch = src:sub(pos,pos)
+                    if ch == "{" then depth = depth + 1
+                    elseif ch == "}" then depth = depth - 1 end
+                    pos = pos + 1
+                end
+                local inner = src:sub(start, pos - 2)
+                local innerCmds = parseCommands(inner)
+                for _, ic in ipairs(innerCmds) do
+                    ic.addr1 = ic.addr1 or addr1
+                    ic.addr2 = ic.addr2 or addr2
+                end
+                for _, ic in ipairs(innerCmds) do
+                    table.insert(cmds, ic)
+                end
+
+            elseif cmd == "\n" or cmd == ";" then
+            else
+            end
+        end
     end
 
     return cmds

install/data/tarbad

@@ -1,4 +1,3 @@
-
 local function octal_to_number(str)
     str = str:gsub("%z", ""):match("^%s*(.-)%s*$")
     return tonumber(str, 8) or 0
@@ -98,29 +97,30 @@ local function unpack_tar(tarstr)
         local pad = (512 - (size % 512)) % 512
         i = i + size + pad
 
-        if name == "" then goto continue end
+        if name ~= "" then
 
-                local is_dir = typeflag == "5" or name:sub(-1) == "/"
+            local is_dir = typeflag == "5" or name:sub(-1) == "/"
+            local clean_name = name:gsub("/$", "")
             
-                local clean_name = name:gsub("/$", "")
-        if clean_name == "" then goto continue end
+            if clean_name ~= "" then
 
-        local parent_path = clean_name:match("(.+)/")
-        local fname = clean_name:match("([^/]+)$")
-        if not fname then goto continue end
+                local parent_path = clean_name:match("(.+)/")
+                local fname = clean_name:match("([^/]+)$")
+                if not fname then
 
-        local parent = root
-        if parent_path then
-            parent = make_dirs(root, parent_path .. "/")
+                    local parent = root
+                    if parent_path then
+                        parent = make_dirs(root, parent_path .. "/")
+                    end
+                
+                    if is_dir then
+                        parent[fname] = parent[fname] or { __type = "dir", __entries = {} }
+                    else
+                        parent[fname] = { __type = "file", __contents = contents }
+                    end
+                end
+            end
         end
-
-        if is_dir then
-            parent[fname] = parent[fname] or { __type = "dir", __entries = {} }
-        else
-            parent[fname] = { __type = "file", __contents = contents }
-        end
-
-        ::continue::
     end
 
     return flatten(root)

install/installcc.lua

@@ -4,24 +4,18 @@ term.clear()
 print("Do you want to install HyperionOS? [Y/n]")
 local input=read()
 if input=="y" or input=="Y" or input=="" then
-    goto install
-else
-    goto exit
+    print("Installing tar but bad...")
+    shell.run("wget https://git.astronand.dev/Hyperion/HyperionOS/raw/branch/main/install/data/tarbad /tar.lua")
+    print("Installing HyperionOS...")
+    print("Installing precompiled tar")
+    shell.run("wget https://git.astronand.dev/Hyperion/HyperionOS/raw/branch/main/install/data/Build.tar /Build.tar")
+    shell.run("tar Build.tar /")
+    print("Removing tar but bad...")
+    shell.run("rm /tar.lua")
+    shell.run("rm $")
+    shell.run("cp Build $")
+    shell.run("rm Build")
+    shell.run("rm Build.tar")
+    fs.copy("/$/boot/cct/eeprom","/startup.lua")
+    dofile("startup.lua")
 end
-
-::install::
-print("Installing tar but bad...")
-shell.run("wget https://git.astronand.dev/Hyperion/HyperionOS/raw/branch/1.2-dev/install/data/tarbad /tar.lua")
-print("Installing HyperionOS...")
-print("Installing precompiled tar")
-shell.run("wget https://git.astronand.dev/Hyperion/HyperionOS/raw/branch/1.2-dev/install/data/Build.tar /Build.tar")
-shell.run("tar Build.tar /")
-print("Removing tar but bad...")
-shell.run("rm /tar.lua")
-shell.run("rm $")
-shell.run("cp Build $")
-shell.run("rm Build")
-shell.run("rm Build.tar")
-fs.copy("/$/boot/cct/eeprom","/startup.lua")
-dofile("startup.lua")
-::exit::