improve pipe write

2 files changed, 30 insertions, 17 deletions

diff --git a/xmake/core/base/pipe.lua b/xmake/core/base/pipe.lua
index c204f4f07..ddf62411d 100644
--- a/xmake/core/base/pipe.lua
+++ b/xmake/core/base/pipe.lua
@@ -67,21 +67,22 @@ function _instance:write(data, opt)
         return -1, errors
     end
 
-    -- data is bytes? table.unpack the raw address
-    local datasize = #data
-    if bytes.instance_of(data) then
-        datasize = data:size()
-        data = {data = data:caddr(), size = data:size()}
+    -- get data address and size for bytes and string
+    if type(data) == "string" then
+        data = bytes(data)
     end
+    local datasize = data:size()
+    local dataaddr = data:caddr()
 
     -- init start and last
     opt = opt or {}
     local start = opt.start or 1
     local last = opt.last or datasize
-
-    -- check start and last
-    if start > last or start < 1 then
-        return -1, string.format("%s: invalid start(%d) and last(%d)!", self, start, last)
+    if start < 1 or start > datasize then
+        return -1, string.format("%s: invalid start(%d)!", self, start)
+    end
+    if last < start - 1 or last > datasize + start - 1 then
+        return -1, string.format("%s: invalid last(%d)!", self, last)
     end
 
     -- write it
@@ -91,7 +92,7 @@ function _instance:write(data, opt)
     if opt.block then
         local size = last + 1 - start
         while start <= last do
-            real, errors = io.pipe_write(self:cdata(), data, start, last)
+            real, errors = io.pipe_write(self:cdata(), dataaddr + start - 1, last + 1 - start)
             if real > 0 then
                 write = write + real
                 start = start + real
@@ -109,7 +110,7 @@ function _instance:write(data, opt)
             write = -1
         end
     else
-        write, errors = io.pipe_write(self:cdata(), data, start, last)
+        write, errors = io.pipe_write(self:cdata(), dataaddr + start - 1, last + 1 - start)
         if write < 0 and errors then
             errors = string.format("%s: %s", self, errors)
         end
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 8fe895a67..f2866ccfd 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -471,19 +471,31 @@ function _instance:sendto(data, addr, port, opt)
         return -1, string.format("%s: sendto empty address!", self)
     end
 
-    -- data is bytes? table.unpack the raw address
-    if bytes.instance_of(data) then
-        data = {data = data:caddr(), size = data:size()}
+    -- get data address and size for bytes and string
+    if type(data) == "string" then
+        data = bytes(data)
     end
+    local datasize = data:size()
+    local dataaddr = data:caddr()
 
-    -- send it
+    -- init start and last
     opt = opt or {}
+    local start = opt.start or 1
+    local last = opt.last or datasize
+    if start < 1 or start > datasize then
+        return -1, string.format("%s: invalid start(%d)!", self, start)
+    end
+    if last < start - 1 or last > datasize + start - 1 then
+        return -1, string.format("%s: invalid last(%d)!", self, last)
+    end
+
+    -- send it
     local send = 0
     local wait = false
     local errors = nil
     if opt.block then
         while true do
-            send, errors = io.socket_sendto(self:cdata(), data, addr, port, self:family())
+            send, errors = io.socket_sendto(self:cdata(), dataaddr + start - 1, last + 1 - start, addr, port, self:family())
             if send == 0 and not wait then
                 local events, waiterrs = _instance.wait(self, socket.EV_SEND, opt.timeout or -1)
                 if events == socket.EV_SEND then
@@ -497,7 +509,7 @@ function _instance:sendto(data, addr, port, opt)
             end
         end
     else
-        send, errors = io.socket_sendto(self:cdata(), data, addr, port, self:family())
+        send, errors = io.socket_sendto(self:cdata(), dataaddr + start - 1, last + 1 - start, addr, port, self:family())
         if send < 0 and errors then
             errors = string.format("%s: %s", self, errors)
         end