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, 10 insertions, 15 deletions

diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 5c83d4f18..96e5565fe 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -455,7 +455,7 @@ Result spawnAndWaitSharedLibrary(TestContext* context, const String& testPath, c
         args.add(exeName.getBuffer());
         for (Index i = 0; i < cmdLine.m_args.getCount(); ++i)
         {
-            args.add(cmdLine.m_args[i].getBuffer());
+            args.add(cmdLine.m_args[i].value.getBuffer());
         }
 
         SlangResult res = func(&stdWriters, context->getSession(), int(args.getCount()), args.begin());
@@ -474,18 +474,15 @@ Result spawnAndWaitSharedLibrary(TestContext* context, const String& testPath, c
 }
 
 
-static SlangResult _extractArg(const List<String>& args, const String& argName, String& outValue)
+static SlangResult _extractArg(const CommandLine& cmdLine, const String& argName, String& outValue)
 {
     SLANG_ASSERT(argName.getLength() > 0 && argName[0] == '-');
+    Index index = cmdLine.findArgIndex(argName.getUnownedSlice());
 
-    const Index count = args.getCount();
-    for (Index i = 0; i < count - 1; ++i)
+    if (index >= 0 && index < cmdLine.getArgCount() - 1)
     {
-        if (args[i] == argName)
-        {
-            outValue = args[i + 1];
-            return SLANG_OK;
-        }
+        outValue = cmdLine.m_args[index + 1].value;
+        return SLANG_OK;
     }
     return SLANG_FAIL;
 }
@@ -591,7 +588,7 @@ static SlangResult _extractRenderTestRequirements(const CommandLine& cmdLine, Te
     // That a similar logic has to be kept inside the implementation of render-test and both this
     // and render-test will have to be kept in sync.
    
-    bool useDxil = _hasOption(args, "-use-dxil");
+    bool useDxil = cmdLine.findArgIndex(UnownedStringSlice::fromLiteral("-use-dxil")) >= 0;
 
     bool usePassthru = false;
 
@@ -603,7 +600,7 @@ static SlangResult _extractRenderTestRequirements(const CommandLine& cmdLine, Te
 
         for (const auto& arg: args)
         {
-            Slang::UnownedStringSlice argSlice = arg.getUnownedSlice();
+            Slang::UnownedStringSlice argSlice = arg.value.getUnownedSlice();
             if (argSlice.size() && argSlice[0] == '-')
             {
                 // Look up the rendering API if set
@@ -701,12 +698,10 @@ static SlangResult _extractRenderTestRequirements(const CommandLine& cmdLine, Te
 static SlangResult _extractSlangCTestRequirements(const CommandLine& cmdLine, TestRequirements* ioRequirements)
 {
     // This determines what the requirements are for a slangc like command line
-    const auto& args = cmdLine.m_args;
-    
     // First check pass through
     {
         String passThrough;
-        if (SLANG_SUCCEEDED(_extractArg(args, "-pass-through", passThrough)))
+        if (SLANG_SUCCEEDED(_extractArg(cmdLine, "-pass-through", passThrough)))
         {
             ioRequirements->addUsed(_toBackendType(passThrough.getUnownedSlice()));
         }
@@ -715,7 +710,7 @@ static SlangResult _extractSlangCTestRequirements(const CommandLine& cmdLine, Te
     // The target if set will also imply a backend
     {
         String targetName;
-        if (SLANG_SUCCEEDED(_extractArg(args, "-target", targetName)))
+        if (SLANG_SUCCEEDED(_extractArg(cmdLine, "-target", targetName)))
         {
             const SlangCompileTarget target = _getCompileTarget(targetName.getUnownedSlice());
             ioRequirements->addUsedBackends(_getBackendFlagsForTarget(target));