fs: fix rwx_to_number, add negated mask mode

Fixes #856.

2 files changed, 35 insertions, 11 deletions

diff --git a/spec/fs_spec.lua b/spec/fs_spec.lua
index 5bec6168..3ed22fbe 100644
--- a/spec/fs_spec.lua
+++ b/spec/fs_spec.lua
@@ -1463,4 +1463,26 @@ describe("Luarocks fs test #unit", function()
          assert.same(fs.modules("lib"), {})
       end)
    end)
+
+   describe("#unix fs._unix_rwx_to_number", function()
+   
+      it("converts permissions in rwx notation to numeric ones", function()
+         assert.same(tonumber("0644", 8), fs._unix_rwx_to_number("rw-r--r--"))
+         assert.same(tonumber("0755", 8), fs._unix_rwx_to_number("rwxr-xr-x"))
+         assert.same(tonumber("0000", 8), fs._unix_rwx_to_number("---------"))
+         assert.same(tonumber("0777", 8), fs._unix_rwx_to_number("rwxrwxrwx"))
+         assert.same(tonumber("0700", 8), fs._unix_rwx_to_number("rwx------"))
+         assert.same(tonumber("0600", 8), fs._unix_rwx_to_number("rw-------"))
+      end)
+
+      it("produces a negated mask if asked to", function()
+         assert.same(tonumber("0133", 8), fs._unix_rwx_to_number("rw-r--r--", true))
+         assert.same(tonumber("0022", 8), fs._unix_rwx_to_number("rwxr-xr-x", true))
+         assert.same(tonumber("0777", 8), fs._unix_rwx_to_number("---------", true))
+         assert.same(tonumber("0000", 8), fs._unix_rwx_to_number("rwxrwxrwx", true))
+         assert.same(tonumber("0077", 8), fs._unix_rwx_to_number("rwx------", true))
+         assert.same(tonumber("0177", 8), fs._unix_rwx_to_number("rw-------", true))
+      end)
+   end)
+
 end)
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 74d8f12f..13b46e19 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -871,6 +871,18 @@ end
 -- POSIX functions
 ---------------------------------------------------------------------
 
+function fs_lua._unix_rwx_to_number(rwx, neg)
+   local num = 0
+   neg = neg or false
+   for i = 1, 9 do
+      local c = rwx:sub(10 - i, 10 - i) == "-"
+      if neg == c then
+         num = num + 2^(i-1)
+      end
+   end
+   return math.floor(num)
+end
+
 if posix_ok then
 
 local octal_to_rwx = {
@@ -884,16 +896,6 @@ local octal_to_rwx = {
    ["7"] = "rwx",
 }
 
-function fs_lua._unix_rwx_to_number(rwx)
-   local num = 0
-   for i = 1, 9 do
-      if rwx:sub(10 - i, 10 - i) == "-" then
-         num = num + 2^i
-      end
-   end
-   return num
-end
-
 do
    local umask_cache
    function fs_lua._unix_umask()
@@ -902,7 +904,7 @@ do
       end
       -- LuaPosix (as of 34.0.4) only returns the umask as rwx
       local rwx = posix.umask()
-      local num = fs_lua._unix_rwx_to_number(rwx)
+      local num = fs_lua._unix_rwx_to_number(rwx, true)
       umask_cache = ("%03o"):format(num)
       return umask_cache
    end