From 05208810d3984cfac773bc6286aa8ead2bd031f9 Mon Sep 17 00:00:00 2001
From: XeonSquared <redtailedairways@gmail.com>
Date: Wed, 18 Mar 2020 14:02:37 +1100
Subject: [PATCH] buffer cleanup

---
 module/buffer.lua   | 8 +++-----
 module/loadfile.lua | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/module/buffer.lua b/module/buffer.lua
index 34d27a1..5609d0a 100644
--- a/module/buffer.lua
+++ b/module/buffer.lua
@@ -2,7 +2,7 @@
 
 buffer = {}
 
-function buffer.new(mode, stream)
+function buffer.new(mode, stream) -- create a new buffer in mode *mode* backed by stream object *stream*
  local result = {
   mode = {},
   stream = stream,
@@ -23,7 +23,6 @@ function buffer.new(mode, stream)
  return setmetatable(result, metatable)
 end
 
-
 local function badFileDescriptor()
  return nil, "bad file descriptor"
 end
@@ -44,7 +43,7 @@ function buffer:flush()
   if reason then
    return nil, reason
   else
-   return nil, "bad file descriptor"
+   return badFileDescriptor()
   end
  end
 
@@ -105,7 +104,6 @@ function buffer:read(...)
    self.bufferRead = sub(self.bufferRead, left + 1)
   until len(buffer) == n
   
-  --kernel.io.println("buffer read: "..tostring(buffer))
   return buffer
  end
 
@@ -360,7 +358,7 @@ end
 
 function buffer:write(...)
  if self.closed then
-  return nil, "bad file descriptor"
+  return badFileDescriptor()
  end
  local args = table.pack(...)
  for i = 1, args.n do
diff --git a/module/loadfile.lua b/module/loadfile.lua
index 35454ea..1551c3e 100644
--- a/module/loadfile.lua
+++ b/module/loadfile.lua
@@ -12,7 +12,7 @@ function os.spawnfile(p,n,...) -- spawns a new process from file *p* with name *
  return os.spawn(function() local res={pcall(loadfile(p), table.unpack(tA))} computer.pushSignal("process_finished", os.pid(), table.unpack(res)) dprint(table.concat(res)) end,n or p)
 end
 _G.package = {}
-package.loaded = {computer=computer,component=component,fs=fs}
+package.loaded = {computer=computer,component=component,fs=fs,buffer=buffer}
 function require(f) -- searches for a library with name *f* and returns what the library returns, if possible
  if not package.loaded[f] then
   local lib = os.getenv("LIB") or "/boot/lib"