From 00a70c5562e0abb5b30f3a7fae1abada1d26001c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 23 Dec 2015 08:42:02 +0100 Subject: util.openssl: Move quoting and tostring call into escape function --- util/openssl.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util/openssl.lua') diff --git a/util/openssl.lua b/util/openssl.lua index 39fe99d6..5043e368 100644 --- a/util/openssl.lua +++ b/util/openssl.lua @@ -144,7 +144,7 @@ end do -- Lua to shell calls. local function shell_escape(s) - return s:gsub("'",[['\'']]); + return "'" .. tostring(s):gsub("'",[['\'']]) .. "'"; end local function serialize(f,o) @@ -153,12 +153,12 @@ do -- Lua to shell calls. if type(k) == "string" then t_insert(r, ("-%s"):format(k)); if v ~= true then - t_insert(r, ("'%s'"):format(shell_escape(tostring(v)))); + t_insert(r, shell_escape(v)); end end end for _,v in ipairs(o) do - t_insert(r, ("'%s'"):format(shell_escape(tostring(v)))); + t_insert(r, shell_escape(v)); end return t_concat(r, " "); end -- cgit v1.2.3