From fa6863a19d3dd40c43975ffb4b3384d9cad40228 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Mon, 11 Aug 2014 12:02:58 -0300
Subject: Apply portability fixes suggested by @ignacio.

---
 src/luarocks/fs/unix.lua    | 4 ++++
 src/luarocks/fs/win32.lua   | 4 ++++
 src/luarocks/upload/api.lua | 8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index a70ed116..6ad5a678 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -107,4 +107,8 @@ function unix.replace_file(old_file, new_file)
    return os.rename(new_file, old_file)
 end
 
+function unix.tmpname()
+   return os.tmpname()
+end
+
 return unix
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 238a25e9..12d86d1d 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -214,4 +214,8 @@ function win32.is_writable(file)
    return result
 end
 
+function win32.tmpname()
+   return os.getenv("TMP")..os.tmpname()
+end
+
 return win32
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua
index 4ab311f2..c5883355 100644
--- a/src/luarocks/upload/api.lua
+++ b/src/luarocks/upload/api.lua
@@ -141,21 +141,21 @@ function Api:request(url, params, post_params)
    end
    local method = "GET"
    local out 
-   local tmpfile = os.tmpname()
+   local tmpfile = fs.tmpname()
    if post_params then
       method = "POST"
-      local curl_cmd = fs.Q(vars.CURL).." -f -k -L --user-agent '"..cfg.user_agent.." via curl' "
+      local curl_cmd = fs.Q(vars.CURL).." -f -k -L --silent --user-agent \""..cfg.user_agent.." via curl\" "
       for k,v in pairs(post_params) do
          local var = v
          if type(v) == "table" then
             var = "@"..v.fname
          end
-         curl_cmd = curl_cmd .. "--form '"..k.."="..var.."' "
+         curl_cmd = curl_cmd .. "--form \""..k.."="..var.."\" "
       end
       if cfg.connection_timeout and cfg.connection_timeout > 0 then
         curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." " 
       end
-      ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> /dev/null 1> "..fs.Q(tmpfile))
+      ok = fs.execute_string(curl_cmd..fs.Q(url).." -o "..fs.Q(tmpfile))
    else
       local ok, err = fs.download(url, tmpfile)
       if not ok then
-- 
cgit v1.2.3-55-g6feb