summaryrefslogtreecommitdiffstats
path: root/source/core/windows/slang-win-process-util.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-06-12 14:28:16 -0400
committerGitHub <noreply@github.com>2019-06-12 14:28:16 -0400
commit7931adac99a78fd5488f665578fba858b34bc8a6 (patch)
treea1d44db6f6e0e53f6064017f109840be6de78e37 /source/core/windows/slang-win-process-util.cpp
parent9d514e65f00dde0e309f33591f31fbf7f132a005 (diff)
Visual Studio compilation working in test harness (#979)
* 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.
Diffstat (limited to 'source/core/windows/slang-win-process-util.cpp')
-rw-r--r--source/core/windows/slang-win-process-util.cpp63
1 files changed, 55 insertions, 8 deletions
diff --git a/source/core/windows/slang-win-process-util.cpp b/source/core/windows/slang-win-process-util.cpp
index 424b87128..680864acb 100644
--- a/source/core/windows/slang-win-process-util.cpp
+++ b/source/core/windows/slang-win-process-util.cpp
@@ -154,10 +154,39 @@ static DWORD WINAPI _readerThreadProc(LPVOID threadParam)
return UnownedStringSlice::fromLiteral(".exe");
}
-static void _appendEscaped(const UnownedStringSlice& slice, StringBuilder& out)
+static bool _isLetter(char c)
+{
+ return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+}
+
+/* Special case handling for command line switches of the form /LINKPATH: that it is immediately followed
+potentially by a path. This detects that kind of switch, and returns the index of the first character after
+the :. If doesn't have the right format returns -1, to indicate that it's not this style of switch */
+static int _calcIndexOfColonSwitch(const UnownedStringSlice& slice)
+{
+ if (!slice.startsWith("/"))
+ {
+ return -1;
+ }
+ int index = slice.indexOf(':');
+ if (index > 0)
+ {
+ for (int i = 1; i < index; ++i)
+ {
+ if (!_isLetter(slice[i]))
+ {
+ return -1;
+ }
+ }
+ }
+ return index + 1;
+}
+
+static void _appendCommandLineEscaped(const UnownedStringSlice& slice, StringBuilder& out)
{
// TODO(JS): This escaping is not complete... !
- if (slice.indexOf(' ') >= 0 || slice.indexOf('"') >= 0)
+
+ if ((slice.indexOf(' ') >= 0 || slice.indexOf('"') >= 0))
{
out << "\"";
@@ -166,7 +195,7 @@ static void _appendEscaped(const UnownedStringSlice& slice, StringBuilder& out)
while (cur < end)
{
- char c= *cur++;
+ char c = *cur++;
switch (c)
{
case '\"':
@@ -181,21 +210,39 @@ static void _appendEscaped(const UnownedStringSlice& slice, StringBuilder& out)
}
out << "\"";
-
return;
}
+ else
+ {
+ out << slice;
+ }
+}
- out << slice;
+/* static */void ProcessUtil::appendCommandLineEscaped(const UnownedStringSlice& slice, StringBuilder& out)
+{
+ // Check if starts with a colon ending switch, as we need to special case escaping in this case
+ const int index = _calcIndexOfColonSwitch(slice);
+ if (index >= 0)
+ {
+ // Append the switch prefix as is (ie /linkpath:)
+ out << UnownedStringSlice(slice.begin(), index);
+ // Append the stuff after the prefix escaping if needed
+ _appendCommandLineEscaped(UnownedStringSlice(slice.begin() + index, slice.end()), out);
+ }
+ else
+ {
+ _appendCommandLineEscaped(slice, out);
+ }
}
/* static */String ProcessUtil::getCommandLineString(const CommandLine& commandLine)
{
StringBuilder cmd;
- _appendEscaped(commandLine.m_executable.getUnownedSlice(), cmd);
+ appendCommandLineEscaped(commandLine.m_executable.getUnownedSlice(), cmd);
for (const auto& arg : commandLine.m_args)
{
cmd << " ";
- _appendEscaped(arg.getUnownedSlice(), cmd);
+ appendCommandLineEscaped(arg.getUnownedSlice(), cmd);
}
return cmd.ToString();
}
@@ -260,7 +307,7 @@ static void _appendEscaped(const UnownedStringSlice& slice, StringBuilder& out)
if (commandLine.m_executableType == CommandLine::ExecutableType::Path)
{
StringBuilder cmd;
- _appendEscaped(commandLine.m_executable.getUnownedSlice(), cmd);
+ appendCommandLineEscaped(commandLine.m_executable.getUnownedSlice(), cmd);
pathBuffer = cmd.toWString();
path = pathBuffer.begin();