Merge pull request #14 from pallene-lang/spec-util

Move util.lua to the specs directory

spec/tracebacks_spec.lua

@@ -3,14 +3,15 @@
 -- Please refer to the LICENSE and AUTHORS files for details
 -- SPDX-License-Identifier: MIT
 
-local util = require "misc.util"
+local util = require "spec.util"
 
 local function assert_test(example, expected_content)
-    local cdir = "spec/tracebacks/"..example.."/";
-    local ok, err = util.execute("cd "..cdir.."&& make")
+    local cdir = util.shell_quote("spec/tracebacks/"..example)
+    local ok, err = util.execute(string.format("cd %s && make", cdir))
     assert(ok, err)
 
-    local ok, _, output_content, err_content = util.outputs_of_execute("cd "..cdir.." && pt-run main.lua")
+    local ok, _, output_content, err_content =
+        util.outputs_of_execute(string.format("cd %s && pt-run main.lua", cdir))
     assert(not ok, output_content)
     assert.are.same(expected_content, err_content)
 end
@@ -82,7 +83,7 @@ Stack traceback:
 ]])
 end)
 
-it("Traceback Ellipsis", function() 
+it("Traceback Ellipsis", function()
     assert_test("ellipsis", [[
 Runtime error: C stack overflow
 Stack traceback:

src/misc/util.lua → spec/util.lua

@@ -20,8 +20,13 @@ function util.get_file_contents(file_name)
 end
 
 -- Quotes a command-line argument according to POSIX shell syntax.
+-- Uses a whitelist of safe chars to avoid quoting too much
 function util.shell_quote(str)
-    return "'" .. string.gsub(str, "'", "'\\''") .. "'"
+    if string.match(str, "^[%w./_-]+$") then
+        return str
+    else
+        return "'" .. string.gsub(str, "'", "'\\''") .. "'"
+    end
 end
 
 function util.execute(cmd)