From a3f93518cc4c41d9bff0e2fbccef3924ee8d0a21 Mon Sep 17 00:00:00 2001
From: Jane Roxanne <janeroxanne0@gmail.com>
Date: Mon, 9 Mar 2020 21:42:47 -0500
Subject: [PATCH] We romfs now bois

---
 lib/fs_foxfs/inode.lua                    | 11 ++++++++---
 release.lua                               |  1 +
 src/loader.lua                            |  2 +-
 src/lzss.lua                              | 12 +++++++++++-
 src/zy-neo/builtins/init_managed/init.lua |  7 ++++---
 src/zy-neo/builtins/util_romfs.lua        | 18 ++++++++++++++----
 src/zy-neo/utils.lua                      |  6 ++----
 src/zy-neo/zinit.lua                      |  7 +++++--
 utils/makezbios.lua                       |  6 +++---
 utils/ser.lua                             |  6 ++++--
 10 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/lib/fs_foxfs/inode.lua b/lib/fs_foxfs/inode.lua
index c716daf..8ab5f89 100644
--- a/lib/fs_foxfs/inode.lua
+++ b/lib/fs_foxfs/inode.lua
@@ -1,11 +1,16 @@
 local function foxfs_getnodes(prox, sec)
-
+[]
 end
 
 local function foxfs_readnode(prox, sec)
-
+	local dat = prox.readSector(sec)
+	local node = {pointers={}}
+	local size
+	node.size, node.namesize, node.mode, node.user, node.group, node.pointers[1], node.pointers[2], node.pointers[3], node.pointers[4], node.pointers[5], node.pointers[6], node.pointers[7], node.pointers[8], node.pointers[9], node.sip, node.dip, node.tip, size = string.unpack("<i3i1i2i2i2i3i3i3i3i3i3i3i3i3i3i3i3", sec)
+	node.name = dat:sub(size+1, size+node.namesize)
+	return node
 end
 
 local function foxfs_update(prox, sec, data)
-
+	
 end
\ No newline at end of file
diff --git a/release.lua b/release.lua
index 8c74129..32a927c 100644
--- a/release.lua
+++ b/release.lua
@@ -13,6 +13,7 @@ os.execute("mkdir -p pkg/bios")
 
 status("Building EEPROM...")
 os.execute("luacomp src/loader.lua -O pkg/bios/managed.bios")
+os.execute("luacomp src/zy-neo/zinit.lua -O debug.lua")
 if (os.execute("[[ $(stat --printf=%s pkg/bios/managed.bios) > 4096 ]]")) then
 	io.stderr:write("WARNING: BIOS is over 4KiB!\n")
 end
diff --git a/src/loader.lua b/src/loader.lua
index e578f7f..1a26008 100644
--- a/src/loader.lua
+++ b/src/loader.lua
@@ -1,2 +1,2 @@
 --#include "src/lzss.lua"
-return load(lzss_decompress($[[luacomp src/zy-neo/zinit.lua -mluamin 2>/dev/null | sed "s/\]\]/]\ ]/g" | lua5.3 utils/makezbios.lua ]]), "=bios.lua")(lzss_decompress)
\ No newline at end of file
+return assert(load(lzss_decompress($[[luacomp src/zy-neo/zinit.lua 2>/dev/null | sed "s/\]\]/]\ ]/g" | lua5.3 utils/makezbios.lua ]]), "=bios.lua"))(lzss_decompress)
\ No newline at end of file
diff --git a/src/lzss.lua b/src/lzss.lua
index 9006799..27d4317 100644
--- a/src/lzss.lua
+++ b/src/lzss.lua
@@ -1 +1,11 @@
-local function lzss_decompress(a)local b,c,d,e,f,g,h,i=1,'',''while b<=#a do e=c.byte(a,b)b=b+1;for j=0,7 do h=c.sub;i=h(a,b,b)if e>>j&1<1 and b<#a then g=c.unpack('>I2',a,b)f=1+g>>4;i=h(d,f,f+g&15+2)b=b+1 end;b=b+1;c=c..i;d=h(d..i,-4^6)end end;return c end
\ No newline at end of file
+function lzss_decompress(a)local b,c,d,e,j,i,h,g=1,'',''while b<=#a do
+e=c.byte(a,b)b=b+1
+for k=0,7 do h=c.sub
+g=h(a,b,b)if e>>k&1<1 and b<#a then
+i=c.unpack('>I2',a,b)j=1+(i>>4)g=h(d,j,j+(i&15)+2)b=b+1
+end
+b=b+1
+c=c..g
+d=h(d..g,-4^6)end
+end
+return c end
\ No newline at end of file
diff --git a/src/zy-neo/builtins/init_managed/init.lua b/src/zy-neo/builtins/init_managed/init.lua
index 94f1e62..323712f 100644
--- a/src/zy-neo/builtins/init_managed/init.lua
+++ b/src/zy-neo/builtins/init_managed/init.lua
@@ -19,7 +19,9 @@ local cfg = component.proxy(component.list("eeprom")()).getData()
 local baddr = cfg:sub(1, 36)
 local bootfs = component.proxy(baddr)
 
-local romfs_file = component.invoke(baddr, "open", ".zy2/bootimage.romfs")
+assert(bootfs.exists(".zy2/image.romfs"), "No boot image!")
+
+local romfs_file = assert(bootfs.open(".zy2/image.romfs", "rb"))
 
 local romfs_dev = romfs.read(function(a)
 	return bootfs.read(romfs_file, a)
@@ -39,8 +41,7 @@ end
 
 function bfs.getcfg()
 	local h = assert(bootfs.open(".zy2/cfg.lua", "r"))
-	readfile(bootfs, h)
-	return 
+	return readfile(bootfs, h)
 end
 
 bfs.addr = baddr
\ No newline at end of file
diff --git a/src/zy-neo/builtins/util_romfs.lua b/src/zy-neo/builtins/util_romfs.lua
index 913b9d0..1479c16 100644
--- a/src/zy-neo/builtins/util_romfs.lua
+++ b/src/zy-neo/builtins/util_romfs.lua
@@ -2,28 +2,38 @@ local romfs = {}
 local arc = {}
 
 local function readint(r, n)
-	return string.unpack("<i"..n, r(n))
+	local str = assert(r(n), "Unexpected EOF!")
+	return string.unpack("<i"..n, str)
 end
 
 function romfs.read(read, seek, close)
-	if read(7) ~= "romfs\1\0" then error("Invalid romfs") end
+	local sig = read(7)
+	utils.debug_log("SIGNATURE", sig, #sig)
+	assert(sig, "Read error!")
+	if sig ~= "romfs\1\0" then error(string.format("Invalid romfs (%.14x != %.14x)", string.unpack("i7", sig), string.unpack("i7", "romfs\1\0"))) end
 	local tbl = {}
 	local lname
 	while lname ~= "TRAILER!!!" do
-		local name = read(readint(read, 1))
+		local nz = read(1):byte()
+		local name = read(nz)
 		local fsize = readint(read, 2)
 		local exec = read(1)
-		tbl[#tbl+1] = {name = name, size = size, exec = exec == "x", pos = seek(0)}
+		tbl[#tbl+1] = {name = name, size = fsize, exec = exec == "x", pos = seek(0)}
+		utils.debug_log(name, fsize, exec)
 		seek(fsize)
+		lname = name
 	end
 	tbl[#tbl] = nil
+	utils.debug_log("ROMFS loaded!")
 	return setmetatable({tbl=tbl, read=read,seek=seek, close=close}, {__index=arc})
 end
 
 function arc:fetch(path)
 	for i=1, #self.tbl do
 		if self.tbl[i].name == path then
+			utils.debug_log("DEBUG", self.tbl[i].pos, self.tbl[i].size)
 			self.seek(self.tbl[i].pos-self.seek(0))
+			utils.debug_log("DEBUG2", self.seek(0))
 			return self.read(self.tbl[i].size)
 		end
 	end
diff --git a/src/zy-neo/utils.lua b/src/zy-neo/utils.lua
index 59947d1..1ff5b5c 100644
--- a/src/zy-neo/utils.lua
+++ b/src/zy-neo/utils.lua
@@ -1,5 +1,3 @@
-
-builtins.utils = function()
 local utils = {}
 
 function utils.debug_log(...)
@@ -59,5 +57,5 @@ function utils.deepcopy(src, dest)
 	end
 	return dest
 end
-return utils
-end
\ No newline at end of file
+utils.debug_log("Zorya NEO Started!")
+builtins.utils = function() return utils end
\ No newline at end of file
diff --git a/src/zy-neo/zinit.lua b/src/zy-neo/zinit.lua
index 3b06992..720f4a3 100644
--- a/src/zy-neo/zinit.lua
+++ b/src/zy-neo/zinit.lua
@@ -23,9 +23,11 @@ local function th_a(func)
 end
 
 local function load_lua(src, ...)
-	if (src:sub(1, 4) == "\27ZLSS") then
+	log(#src)
+	if (src:sub(1, 4) == "\27ZLS") then
 		src = lzss_decompress(src:sub(5))
 	end
+	log("DECOMPRESS", src)
 	return load(src, ...)
 end
 
@@ -89,6 +91,7 @@ th_a(function()
 		local zy = krequire("zorya")
 		zy.add_mod_search(function(mod)
 			if (bfs.exists(".zy2/mods/"..mod..".zy2m")) then
+				utils.debug_log(mod, ".zy2m")
 				return load_lua(bfs.getfile(".zy2/mods/"..mod..".zy2m"), "=.zy2/mods/"..mod..".zy2m")()
 			elseif (bfs.exists(".zy2/mods/"..mod.."/init.zy2m")) then
 				return load_lua(bfs.getfile(".zy2/mods/"..mod.."/init.zy2m"), "=.zy2/mods/"..mod.."/init.zy2m")()
@@ -106,7 +109,7 @@ th_a(function()
 				return load_lua(bfs.getfile(".zy2/lib/"..mod.."/init.zy2l"), "=.zy2/lib/"..mod.."/init.zy2l")
 			end
 		end)
-		local zycfg = bfs.getfile(".zy2/cfg.lua")
+		local zycfg = bfs.getcfg()
 		-- Config loaded, now we can do our shit.
 		local env = {
 			zorya = zy,
diff --git a/utils/makezbios.lua b/utils/makezbios.lua
index 1d20aa3..711f753 100644
--- a/utils/makezbios.lua
+++ b/utils/makezbios.lua
@@ -118,9 +118,7 @@ end
 local function mkstr(d)
 	local dat = "\""
 	for i=1, #f do
-		if (d:byte(i) == 0) then
-			dat = dat .. "\0"
-		elseif (d:sub(i,i) == "\\") then
+		if (d:sub(i,i) == "\\") then
 			dat = dat .. ("\\\\")
 		elseif (d:sub(i,i) == "\"") then
 			dat = dat .. ("\\\"")
@@ -128,6 +126,8 @@ local function mkstr(d)
 			dat = dat .. ("\\n")
 		elseif (d:sub(i,i) == "\r") then
 			dat = dat .. ("\\r")
+		elseif (d:sub(i,i) == "\t") then
+			dat = dat .. ("\\t")
 		else
 			dat = dat .. (d:sub(i,i))
 		end
diff --git a/utils/ser.lua b/utils/ser.lua
index a4f5cad..02e8ae7 100644
--- a/utils/ser.lua
+++ b/utils/ser.lua
@@ -111,12 +111,12 @@ function writeFile(path, data)
 	--fs.close(hand)
 	fs.write(romfs, string.char(#path)..path)
 	local ext = path:sub(#path-2)
+	fs.write(romfs, string.pack("<i2", #data))
 	if (ext == "lua" or ext == "z2l" or ext == "z2y") then
 		fs.write(romfs, "x")
 	else
 		fs.write(romfs, "-")
 	end
-	fs.write(romfs, string.pack("<i2", #data))
 	fs.write(romfs, data)
 end
 
@@ -162,11 +162,13 @@ eeprom.setLabel("Zorya NEO BIOS v2.0")
 setBar(100)
 setStatus("Rebooting in 5 seconds...")
 if not fs.exists(".zy2/cfg.lua") then
-	writeFile(fs, ".zy2/cfg.lua", string.format([[local menu = loadmod("menu_classic")
+	local hand = fs.open(".zy2/cfg.lua", "w")
+	fs.write(hand, string.format([[local menu = loadmod("menu_classic")
 menu.add("OpenOS on %s", function()
 	return loadmod("loader_openos")("%s")
 end)
 menu.draw()]], fsaddr:sub(1, 3), fsaddr))
+	fs.close(hand)
 end
 computer = computer or require("computer")
 local stime = computer.uptime()