Merge pull request #29 from ignacio/master

Luarocks fails to pack some large rocks when lzlib is installed

1 files changed, 3 insertions, 5 deletions

diff --git a/src/luarocks/tools/zip.lua b/src/luarocks/tools/zip.lua
index caeb4ac9..36adc7e2 100644
--- a/src/luarocks/tools/zip.lua
+++ b/src/luarocks/tools/zip.lua
@@ -5,8 +5,6 @@ local zlib = require("zlib")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 
-local size_buf = 65535
-
 local function number_to_bytestring(number, nbytes)
    local out = {}
    for i = 1, nbytes do
@@ -115,8 +113,8 @@ local function zipwriter_add(self, file)
          err = "error opening "..file.." for reading"
       end
    end
-   while ok do
-      local buf = fin:read(size_buf)
+   if ok then
+      local buf = fin:read("*a")
       if not buf then
          break
       end
@@ -190,7 +188,7 @@ function new_zipwriter(name)
    
    local zw = {}
   
-   zw.ziphandle = io.open(name, "w")
+   zw.ziphandle = io.open(name, "wb")
    if not zw.ziphandle then
       return nil
    end