Compare commits

..

No commits in common. "3266c66fc4e306fe888979a7cd44b190db456f6d" and "97e559f26f8c36027f1e742fc1196f4a394c29e6" have entirely different histories.

3 changed files with 9 additions and 26 deletions

View File

@ -111,6 +111,4 @@ function pkgfs.add(fname,comp) -- string boolean -- -- Add a package as specifie
f:close() f:close()
end end
fs.makeDirectory("/pkg")
fs.mount("/pkg",pkgfs.component)
return pkgfs return pkgfs

View File

@ -68,11 +68,7 @@ function fs.copy(from,to) -- string string -- boolean -- copies a file from *fro
if not of or not df then if not of or not df then
return false return false
end end
local tmp df:write(of:read("*a"))
repeat
tmp = of:read(2048)
df:write(tmp or "")
until not tmp
df:close() df:close()
of:close() of:close()
return true return true

View File

@ -3,15 +3,13 @@ local serial = require "serialization"
local cfg = {["path"]="/boot/srv/frequest",["port"]=70} local cfg = {["path"]="/boot/srv/frequest",["port"]=70}
local function loadConfig(cfgpath) f=io.open("/boot/cfg/fserv.cfg","rb")
local f=io.open(cfgpath or "/boot/cfg/fserv.cfg","rb") if f then
if f then
local ncfg = serial.unserialize(f:read("*a")) local ncfg = serial.unserialize(f:read("*a"))
f:close() f:close()
for k,v in pairs(ncfg) do for k,v in pairs(ncfg) do
cfg[k] = v cfg[k] = v
end end
end
end end
local function fileHandler(socket,rtype,path) local function fileHandler(socket,rtype,path)
@ -92,15 +90,6 @@ local function socketHandler(socket)
end end
end end
local function fileServer() while true do
while true do
os.spawn(socketHandler(minitel.listen(70)),"fserv worker process") os.spawn(socketHandler(minitel.listen(70)),"fserv worker process")
end
end end
function start(cfgpath)
loadConfig(cfgpath)
return os.spawn(fileServer,"fserv")
end
return {start=start}