local table = require "table"
local nixio = require "nixio"
-local getmetatable, assert, pairs = getmetatable, assert, pairs
+local getmetatable, assert, pairs, type = getmetatable, assert, pairs, type
module "nixio.util"
-local BUFFERSIZE = 8096
+local BUFFERSIZE = nixio.const.buffersize
+local ZIOBLKSIZE = 65536
local socket = nixio.meta_socket
local tls_socket = nixio.meta_tls_socket
local file = nixio.meta_file
+local uname = nixio.uname()
+local ZBUG = uname.sysname == "Linux" and uname.release:sub(1, 3) == "2.4"
+
+function consume(iter, append)
+ local tbl = append or {}
+ if iter then
+ for obj in iter do
+ tbl[#tbl+1] = obj
+ end
+ end
+ return tbl
+end
local meta = {}
end
function meta.readall(self, len)
- local block, code, msg = self:read(len)
+ local block, code, msg = self:read(len or BUFFERSIZE)
if not block then
- return "", code, msg, len
+ return nil, code, msg, ""
elseif #block == 0 then
- return "", nil, nil, len
+ return "", nil, nil, ""
end
local data, total = {block}, #block
- while len > total do
- block, code, msg = self:read(len - total)
+ while not len or len > total do
+ block, code, msg = self:read(len and (len - total) or BUFFERSIZE)
if not block then
- return data, code, msg, len - #data
+ return nil, code, msg, table.concat(data)
elseif #block == 0 then
- return data, nil, nil, len - #data
+ break
end
data[#data+1], total = block, total + #block
end
- return (#data > 1 and table.concat(data) or data[1]), nil, nil, 0
+ local data = #data > 1 and table.concat(data) or data[1]
+ return data, nil, nil, data
end
meta.recvall = meta.readall
function meta.writeall(self, data)
- local total, block = 0
local sent, code, msg = self:write(data)
if not sent then
- return total, code, msg, data
+ return nil, code, msg, 0
end
- while sent < #data do
- block, total = data:sub(sent + 1), total + sent
- sent, code, msg = self:write(block)
-
+ local total = sent
+
+ while total < #data do
+ sent, code, msg = self:write(data, total)
+
if not sent then
- return total, code, msg, block
+ return nil, code, msg, total
end
+
+ total = total + sent
end
- return total + sent, nil, nil, ""
+ return total, nil, nil, total
end
meta.sendall = meta.writeall
if flush then
line = buffer:sub(bpos + 1)
- buffer = ""
+ buffer = type(flush) == "string" and flush or ""
bpos = 0
return line
end
bpos = endp
return line
elseif #buffer < limit + bpos then
- local newblock, code = self:read(limit + bpos - #buffer)
+ local newblock, code, msg = self:read(limit + bpos - #buffer)
if not newblock then
- return nil, code
+ return nil, code, msg
elseif #newblock == 0 then
return nil
end
local block, code, msg = self:read(toread)
if not block then
- return nil, code
+ return nil, code, msg
elseif #block == 0 then
return nil
else
end
end
+function meta.copy(self, fdout, size)
+ local source = self:blocksource(nil, size)
+ local sink = fdout:sink()
+ local sent, chunk, code, msg = 0
+
+ repeat
+ chunk, code, msg = source()
+ sink(chunk, code, msg)
+ sent = chunk and (sent + #chunk) or sent
+ until not chunk
+ return not code and sent or nil, code, msg, sent
+end
+
+function meta.copyz(self, fd, size)
+ local sent, lsent, code, msg = 0
+ local splicable
+
+ if not ZBUG and self:is_file() then
+ local ftype = self:stat("type")
+ if nixio.sendfile and fd:is_socket() and ftype == "reg" then
+ repeat
+ lsent, code, msg = nixio.sendfile(fd, self, size or ZIOBLKSIZE)
+ if lsent then
+ sent = sent + lsent
+ size = size and (size - lsent)
+ end
+ until (not lsent or lsent == 0 or (size and size == 0))
+ if lsent or (not lsent and sent == 0 and
+ code ~= nixio.const.ENOSYS and code ~= nixio.const.EINVAL) then
+ return lsent and sent, code, msg, sent
+ end
+ elseif nixio.splice and not fd:is_tls_socket() and ftype == "fifo" then
+ splicable = true
+ end
+ end
+
+ if nixio.splice and fd:is_file() and not splicable then
+ splicable = not self:is_tls_socket() and fd:stat("type") == "fifo"
+ end
+
+ if splicable then
+ repeat
+ lsent, code, msg = nixio.splice(self, fd, size or ZIOBLKSIZE)
+ if lsent then
+ sent = sent + lsent
+ size = size and (size - lsent)
+ end
+ until (not lsent or lsent == 0 or (size and size == 0))
+ if lsent or (not lsent and sent == 0 and
+ code ~= nixio.const.ENOSYS and code ~= nixio.const.EINVAL) then
+ return lsent and sent, code, msg, sent
+ end
+ end
+
+ return self:copy(fd, size)
+end
+
function tls_socket.close(self)
return self.socket:close()
end
+function tls_socket.getsockname(self)
+ return self.socket:getsockname()
+end
+
+function tls_socket.getpeername(self)
+ return self.socket:getpeername()
+end
+
+function tls_socket.getsockopt(self, ...)
+ return self.socket:getsockopt(...)
+end
+tls_socket.getopt = tls_socket.getsockopt
+
+function tls_socket.setsockopt(self, ...)
+ return self.socket:setsockopt(...)
+end
+tls_socket.setopt = tls_socket.setsockopt
+
for k, v in pairs(meta) do
file[k] = v
socket[k] = v
tls_socket[k] = v
-end
\ No newline at end of file
+end
projects / project / luci.git / blobdiff