From ce02798aeb0f8f4de7b9a8cab4908e180845fee6 Mon Sep 17 00:00:00 2001 From: XeonSquared Date: Sat, 7 Oct 2023 08:05:13 +1000 Subject: [PATCH] add some requires and such so rtfs will run on OpenOS unmodified --- rtfs/lib/fs/rtfs/init.lua | 3 +++ rtfs/lib/fs/rtfs/v1.lua | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rtfs/lib/fs/rtfs/init.lua b/rtfs/lib/fs/rtfs/init.lua index a037187..1f55527 100644 --- a/rtfs/lib/fs/rtfs/init.lua +++ b/rtfs/lib/fs/rtfs/init.lua @@ -1,3 +1,6 @@ +local fs = fs or require "filesystem" +local component = require "component" +local computer = require "computer" local cache = (package.loaded["fs.rtfs"] or {}).cache or {hitsR=0, hitsW=0, missesR=0, missesW=0} local proxy = {} local rtfs = {proxy=proxy, cache=cache} diff --git a/rtfs/lib/fs/rtfs/v1.lua b/rtfs/lib/fs/rtfs/v1.lua index 70358da..1680b58 100644 --- a/rtfs/lib/fs/rtfs/v1.lua +++ b/rtfs/lib/fs/rtfs/v1.lua @@ -1,3 +1,4 @@ +local fs = fs or require "filesystem" local common = require "fs.rtfs" local rtfs, proxy = {}, setmetatable({},{__index=common.proxy}) local ieformat = ">I2I8I8c46" -- type (4 bits) and index (12 bits), start sector (32 bits), lenth in bytes (32 bits), name/path (46 bytes) @@ -373,7 +374,7 @@ function proxy:compactIndex(ti) return ri end -function rtfs.mount(p) +function rtfs.mount(p,ro) local d = common.getProxy(p) local p = setmetatable({}, {__index=proxy}) p.d = d @@ -420,7 +421,7 @@ function rtfs.mount(p) function p.spaceTotal() return p.capacity - (math.ceil(p.isize / (p.blockSize / iesize))*p.blockSize) - p.blockSize end - p.isReadOnly = p.d.isReadOnly + p.isReadOnly = p.d.isReadOnly or function() return ro or false end function p.list(name) name = fnormalize(name)