Ensure that channel files are closed if terminated

disknet.lua

@@ -159,64 +159,74 @@ disknet.receive = function(channel)
 
 		loadFList()
 
-		while true do
+		local good, goddamnit = pcall(function()
-			for i = 1, #fList do
+			while true do
-				contents = fList[i].readAll()
+				for i = 1, #fList do
-				if contents ~= "" then
+					contents = fList[i].readAll()
-					fList[i].close()
+					if contents ~= "" then
-					fList[i] = fs.open(pList[i], "r")
+						fList[i].close()
-					contents = textutils.unserialize(fList[i].readAll())
+						fList[i] = fs.open(pList[i], "r")
-					if type(contents) == "table" then
+						contents = textutils.unserialize(fList[i].readAll())
-						if contents[1] then
+						if type(contents) == "table" then
-							if not output then
+							if contents[1] then
-								for look = 1, #contents do
+								if not output then
-									if (contents[look].uniqueID ~= uniqueID) and (not msgCheckList[contents[look].messageID]) then
+									for look = 1, #contents do
-										if getTime() - (contents[look].time or 0) <= 0.001 then
+										if (contents[look].uniqueID ~= uniqueID) and (not msgCheckList[contents[look].messageID]) then
-											msgCheckList[contents[look].messageID] = true
+											if getTime() - (contents[look].time or 0) <= 0.001 then
-											output = {}
+												msgCheckList[contents[look].messageID] = true
-											for k,v in pairs(contents[look]) do
+												output = {}
-												output[k] = v
+												for k,v in pairs(contents[look]) do
+													output[k] = v
+												end
+												break
 											end
-											break
 										end
 									end
 								end
-							end
 
-							-- delete old msesages
+								-- delete old msesages
-							doRewrite = false
+								doRewrite = false
-							for t = #contents, 1, -1 do
+								for t = #contents, 1, -1 do
-								if getTime() - (contents[t].time or 0) > 0.001 then
+									if getTime() - (contents[t].time or 0) > 0.001 then
-									msgCheckList[contents[t].messageID] = nil
+										msgCheckList[contents[t].messageID] = nil
-									table.remove(contents, t)
+										table.remove(contents, t)
-									doRewrite = true
+										doRewrite = true
+									end
 								end
-							end
+								if doRewrite then
-							if doRewrite then
+									writeFile(pList[i], textutils.serialize(contents))
-								writeFile(pList[i], textutils.serialize(contents))
+								end
-							end
+								if output then
-							if output then
+									for i = 1, #fList do
-								for i = 1, #fList do
+										fList[i].close()
-									fList[i].close()
+									end
+									fList, pList = {}, {}
+									break
 								end
-								break
 							end
 						end
 					end
 				end
+				if output then
+					break
+				else
+					os.queueEvent("")
+					os.pullEvent("")
+				end
 			end
-			if output then
+		end)
-				break
-			else
-				os.queueEvent("")
-				os.pullEvent("")
-			end
-		end
 
-		if contents then
+		if good then
-			return output.message, output.channel, output.id, output.time
+			if contents then
+				return output.message, output.channel, output.id, output.time
+			else
+				return nil
+			end
 		else
-			return nil
+			for i = 1, #fList do
+				fList[i].close()
+			end
+			error(goddamnit, 0)
 		end
 	else
 		error(grr)