Merge pull request 'libs: Make libmtar assert on version, make download close the connection' (#6) from Amanda/OC-PsychOS2:libs/minor-fixes into master

Reviewed-on: https://git.shadowkat.net/izaya/OC-PsychOS2/pulls/6

lib/download.lua

@@ -110,6 +110,7 @@ function dl.protos.http(host, optPort, path, dest, url) -- string string string
   ns = R.read()
   f:write(ns or "")
  until not ns
+ R.close()
  f:close()
  print("Done.")
  return true

lib/libmtar.lua

@@ -38,6 +38,7 @@ function mtar.iter(stream) -- table -- function -- Given buffer *stream*, return
    return
   elseif nlen == 65535 then -- versioned header
    version = string.byte(stream:read(1))
+   assert(versions[version], "Unknown version: " .. version)
    nlen = string.unpack(versions[version].nlf, stream:read(string.packsize(versions[version].nlf)))
   end
   local name = cleanPath(stream:read(nlen))

service/clipboard.lua

@@ -15,3 +15,4 @@ function start()
    end
  end)
 end
+return {start=start}

service/screenblank.lua

@@ -21,5 +21,6 @@ function start()
     state = false
    end
   end
- end,"screenblank")
+ end, "screenblank")
 end
+return {start=start}

service/tape-devfs.lua

@@ -16,13 +16,19 @@ end
 for addr in component.list("tape_drive") do
  addNode(addr)
 end
-while true do
+
- local tE = {coroutine.yield()}
+function start()
- if tE[1] == "component_added" and tE[3] == "tape_drive" then
+ return os.spawn(function()
-  addNode(tE[2])
+  while true do
- elseif tE[1] == "component_removed" and tE[3] == "tape_drive" then
+   local tE = {coroutine.yield()}
-  if td[tE[2]] then
+   if tE[1] == "component_added" and tE[3] == "tape_drive" then
-   fs.remove("/dev/tape"..tostring(td[tE[2]]))
+    addNode(tE[2])
+   elseif tE[1] == "component_removed" and tE[3] == "tape_drive" then
+    if td[tE[2]] then
+     fs.remove("/dev/tape"..tostring(td[tE[2]]))
+    end
+   end
   end
- end
+ end, "tape-devfs")
 end
+return {start=start}

service/termsrv.lua

@@ -61,3 +61,4 @@ function start()
  end
  end,"termsrv")
 end
+return {start=start}

service/wolbeacon.lua

@@ -6,13 +6,18 @@ for modem in component.list("modem") do
  component.invoke(modem,"setWakeMessage",message)
 end
 
-local ltime = computer.uptime()
+function start()
-while true do
+ return os.spawn(function()
- if computer.uptime() > ltime+delay then
+  local ltime = computer.uptime()
-  for modem in component.list("modem") do
+  while true do
-   component.invoke(modem,"broadcast",port,message)
+   if computer.uptime() > ltime+delay then
+    for modem in component.list("modem") do
+     component.invoke(modem,"broadcast",port,message)
+    end
+    ltime=computer.uptime()
+   end
+   coroutine.yield()
   end
-  ltime=computer.uptime()
+ end, "WoLBeacon")
- end
- coroutine.yield()
 end
+return {start=start}