1 files changed, 22 insertions, 32 deletions

diff --git a/src/tp.lua b/src/tp.lua
index d8dabc0..3912fab 100644
--- a/src/tp.lua
+++ b/src/tp.lua
@@ -18,32 +18,18 @@ setfenv(1, socket.tp)
 
 TIMEOUT = 60
 
--- tries to get a pattern from the server and closes socket on error
-local function try_receiving(sock, pattern)
-    local data, message = sock:receive(pattern)
-    if not data then sock:close() end
-    return data, message
-end
-
--- tries to send data to server and closes socket on error
-local function try_sending(sock, data)
-    local sent, message = sock:send(data)
-    if not sent then sock:close() end
-    return sent, message
-end
-
 -- gets server reply
 local function get_reply(sock)
     local code, current, separator, _
-    local line, message = try_receiving(sock)
+    local line, err = sock:receive()
     local reply = line
-    if message then return nil, message end
+    if err then return nil, err end
     _, _, code, separator = string.find(line, "^(%d%d%d)(.?)")
     if not code then return nil, "invalid server reply" end
     if separator == "-" then -- reply is multiline
         repeat
-            line, message = try_receiving(sock)
-            if message then return nil, message end
+            line, err = sock:receive()
+            if err then return nil, err end
             _,_, current, separator = string.find(line, "^(%d%d%d)(.)")
             if not current or not separator then 
                 return nil, "invalid server reply" 
@@ -58,29 +44,25 @@ end
 -- metatable for sock object
 local metatable = { __index = {} }
 
--- execute the "check" instr
 function metatable.__index:check(ok)
     local code, reply = get_reply(self.sock)
     if not code then return nil, reply end
     if type(ok) ~= "function" then
-        if type(ok) ~= "table" then ok = {ok} end
-        for i, v in ipairs(ok) do
-            if string.find(code, v) then return code, reply end
+        if type(ok) == "table" then 
+            for i, v in ipairs(ok) do
+                if string.find(code, v) then return code, reply end
+            end
+            return nil, reply
+        else
+            if string.find(code, ok) then return code, reply 
+            else return nil, reply end
         end
-        return nil, reply
     else return ok(code, reply) end
 end
 
-function metatable.__index:cmdchk(cmd, arg, ok)
-    local code, err = self:command(cmd, arg)
-    if not code then return nil, err end
-    return self:check(ok)
-end
-
--- execute the "command" instr
 function metatable.__index:command(cmd, arg)
-    if arg then return try_sending(self.sock, cmd .. " " .. arg.. "\r\n")
-    return try_sending(self.sock, cmd .. "\r\n") end
+    if arg then return self.sock:send(cmd .. " " .. arg.. "\r\n")
+    else return self.sock:send(cmd .. "\r\n") end
 end
 
 function metatable.__index:sink(snk, pat)
@@ -88,6 +70,14 @@ function metatable.__index:sink(snk, pat)
     return snk(chunk, err)
 end
 
+function metatable.__index:send(data)
+    return self.sock:send(data)
+end
+
+function metatable.__index:receive(pat)
+    return self.sock:receive(pat)
+end
+
 function metatable.__index:source(src, instr)
     while true do
         local chunk, err = src()