CommandLine arg escaping (#980)

* Work in progress to be able to invoke VS from within code.

* First pass at windows version of refactor of OSProcessSpawner

* Closer to getting VS path lookup working.

* Make OSString assignable/ctor able

* Work out program files directory directly, so don't have to expand %%.

* WIP: Improve handling of process spawning.

* Add support for splitting input by line.

* * Correctly locates visual studio install
* Added functionality to invoke vs via cmd

* Add option to execute the command line.

* Handle in ProcessUtil for windows -> WinHandle.

* Rename files slang-win-visual-studio-util.cpp/.h and slang-process-util.h

* First pass at unix/linux version of ProcessUtil.

* Fix reading Visual Studio path from the registry.

* Get compiling on linux with.

* Fix vcvarsall.bat name

* Use ProcessUtil to execute external code.

* Remove OSProcessSpawner.

* Remove includes for "os.h" where no longer needed.

* Fix tabbing issue in premake5.lua
Remove test code from slang-test-main.cpp

* Fix premake4.lua tabbing issue.

* Small fixes to slang-process-util.h
Init ExecuteResult on Win execute.

* Improve comments.

* Fix bug in StringUtil::calcLines - with oddly terminated source input being able to read past end.
Make slang-generate use StringUtil over it's own impl.

* Fix off by one bug in working out Visual Studio version.

* Fix bug in calculating Visual Studio Version

* Fix compilation on linux with string parameter being passed to messageFormat.

* Remove erroneous use of kOSError codes - use Result.

* First effort to generate standard compiler options.

* Initial efforts in compiling source code in test framework for VisualStudio.

* Testing compiling c code on VisualStudio on Windows.

* Fix warning on linux.

* Fix clang on linux warning (and therefore failing) returning a StringBuilder as String.

* Disable return-std-move on clang.

* CommandLine arguments are now tagged if they are escaped or not. That it is the clients responsibility to escape command lines that cannot be automatically escaped.

* Add checks on unix/linux that command line args are all unescaped.

1 files changed, 15 insertions, 3 deletions

diff --git a/source/core/unix/slang-unix-process-util.cpp b/source/core/unix/slang-unix-process-util.cpp
index ee61cbc85..0447dd499 100644
--- a/source/core/unix/slang-unix-process-util.cpp
+++ b/source/core/unix/slang-unix-process-util.cpp
@@ -59,12 +59,21 @@ namespace Slang {
 
 /* static */String ProcessUtil::getCommandLineString(const CommandLine& commandLine)
 {
+    // When outputting the command line we potentially need to escape the path to the
+    // command and args - that aren't already explicitly marked as escaped. 
     StringBuilder cmd;
     appendCommandLineEscaped(commandLine.m_executable.getUnownedSlice(), cmd);
     for (const auto& arg : commandLine.m_args)
     {
         cmd << " ";
-        appendCommandLineEscaped(arg.getUnownedSlice(), cmd);
+        if (arg.type == CommandLine::ArgType::Unescaped)
+        {
+            appendCommandLineEscaped(arg.value.getUnownedSlice(), cmd);
+        }
+        else
+        {
+            cmd << arg.value;
+        }
     }
     return cmd.ToString();
 }
@@ -76,10 +85,13 @@ namespace Slang {
     List<char const*> argPtrs;
     // Add the command
     argPtrs.add(commandLine.m_executable.getBuffer());
-    // Add all the args
+
+    // Add all the args - they don't need any explicit escaping
     for (auto arg : commandLine.m_args)
     {
-        argPtrs.add(arg.getBuffer());
+        // All args for this target must be unescaped
+        SLANG_ASSERT(arg.type == CommandLine::ArgType::Unescaped);
+        argPtrs.add(arg.value.getBuffer());
     }
     // Terminate with a null
     argPtrs.add(nullptr);