Merge branch 'master' into luarocks-3

3 files changed, 18 insertions, 32 deletions

diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 770da2b7..e4c6ca05 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -30,17 +30,6 @@ local dir_stack = {}
 
 local dir_separator = "/"
 
---- Quote argument for shell processing.
--- Adds single quotes and escapes.
--- @param arg string: Unquoted argument.
--- @return string: Quoted argument.
-function fs_lua.Q(arg)
-   assert(type(arg) == "string")
-
-   -- FIXME Unix-specific
-   return "'" .. arg:gsub("'", "'\\''") .. "'"
-end
-
 --- Test is file/dir is writable.
 -- Warning: testing if a file/dir is writable does not guarantee
 -- that it will remain writable and therefore it is no replacement
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index df9d256d..aca64ac0 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -22,6 +22,15 @@ function unix.quiet_stderr(cmd)
    return cmd.." 2> /dev/null"
 end
 
+--- Quote argument for shell processing.
+-- Adds single quotes and escapes.
+-- @param arg string: Unquoted argument.
+-- @return string: Quoted argument.
+function unix.Q(arg)
+   assert(type(arg) == "string")
+   return "'" .. arg:gsub("'", "'\\''") .. "'"
+end
+
 --- Return an absolute pathname from a potentially relative one.
 -- @param pathname string: pathname to convert.
 -- @param relative_to string or nil: path to prepend when making
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 9ce95986..2216d2fa 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -35,19 +35,6 @@ end
 
 local drive_letter = "[%.a-zA-Z]?:?[\\/]"
 
-local win_escape_chars = {
-  ["%"] = "%%",
-  ['"'] = '\\"',
-}
-
-local function q_escaper(bs, q)
-  return ("\\"):rep(2*#bs-1) .. (q or "\\")
-end
-
-local function p_escaper(bs)
-   return bs .. bs .. '"%"'
-end
-
 --- Quote argument for shell processing. Fixes paths on Windows.
 -- Adds double quotes and escapes.
 -- @param arg string: Unquoted argument.
@@ -61,11 +48,11 @@ function win32.Q(arg)
    if arg == "\\" then
       return '\\' -- CHDIR needs special handling for root dir
    end
-    -- URLs and anything else
-   arg = arg:gsub('(\\+)(")', q_escaper)
-   arg = arg:gsub('(\\+)$', q_escaper)
-   arg = arg:gsub('"', win_escape_chars)
-   arg = arg:gsub('(\\*)%%', p_escaper)
+   -- URLs and anything else
+   arg = arg:gsub('\\(\\*)"', '\\%1%1"')
+   arg = arg:gsub('\\+$', '%0%0')
+   arg = arg:gsub('"', '\\"')
+   arg = arg:gsub('(\\*)%%', '%1%1"%%"')
    return '"' .. arg .. '"'
 end
 
@@ -83,9 +70,10 @@ function win32.Qb(arg)
       return '\\' -- CHDIR needs special handling for root dir
    end
    -- URLs and anything else
-   arg = arg:gsub('(\\+)(")', q_escaper)
-   arg = arg:gsub('(\\+)$', q_escaper)
-   arg = arg:gsub('[%%"]', win_escape_chars)
+   arg = arg:gsub('\\(\\*)"', '\\%1%1"')
+   arg = arg:gsub('\\+$', '%0%0')
+   arg = arg:gsub('"', '\\"')
+   arg = arg:gsub('%%', '%%%%')
    return '"' .. arg .. '"'
 end