1.2-dev #11

Merged
Astronand merged 2 commits from 1.2-dev into main 2026-03-12 19:32:16 -04:00
4 changed files with 94 additions and 99 deletions

View File

@@ -136,7 +136,7 @@ for i,v in ipairs(split(fstab,"\n")) do
local id="" local id=""
for i=3,#v do for i=3,#v do
if v:sub(i,i)==";" then if v:sub(i,i)==";" then
if i==3 then kernel.log("Invalid fstab line... Skipping.","WARN") skip == true; break end if i==3 then kernel.log("Invalid fstab line... Skipping.","WARN") skip = true break end
id=v:sub(3,i-1) id=v:sub(3,i-1)
end end
end end

View File

@@ -126,7 +126,7 @@ local function doLogin()
syscall.write(1, "Username: ") syscall.write(1, "Username: ")
local username = readLine(nil) local username = readLine(nil)
if username == "" then goto continue end if username ~= "" then
syscall.write(1, "Password: ") syscall.write(1, "Password: ")
local password = readLine("*") local password = readLine("*")
@@ -154,8 +154,7 @@ local function doLogin()
syscall.write(1, "Login incorrect.\n\n") syscall.write(1, "Login incorrect.\n\n")
syscall.devctl(1, "sfgc", 1) syscall.devctl(1, "sfgc", 1)
end end
end
::continue::
end end
syscall.devctl(1, "sfgc", 2) syscall.devctl(1, "sfgc", 2)

View File

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

View File

@@ -139,12 +139,9 @@ local function parseCommands(src)
local c = src:sub(pos, pos) local c = src:sub(pos, pos)
if c == "\n" or c == ";" then if c == "\n" or c == ";" then
pos = pos + 1 pos = pos + 1
goto continue elseif c == "#" then
end
if c == "#" then
while pos <= len and src:sub(pos,pos) ~= "\n" do pos = pos + 1 end while pos <= len and src:sub(pos,pos) ~= "\n" do pos = pos + 1 end
goto continue else
end
local addr1, addr2 local addr1, addr2
addr1, pos = parseAddr(src, pos) addr1, pos = parseAddr(src, pos)
@@ -203,8 +200,7 @@ local function parseCommands(src)
elseif cmd == "\n" or cmd == ";" then elseif cmd == "\n" or cmd == ";" then
else else
end end
end
::continue::
end end
return cmds return cmds