summaryrefslogtreecommitdiffstats
path: root/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'source/core')
-rw-r--r--source/core/slang-process-util.h76
-rw-r--r--source/core/unix/slang-unix-process-util.cpp18
-rw-r--r--source/core/windows/slang-win-process-util.cpp56
-rw-r--r--source/core/windows/slang-win-visual-studio-util.cpp26
4 files changed, 102 insertions, 74 deletions
diff --git a/source/core/slang-process-util.h b/source/core/slang-process-util.h
index 75ea945fe..03265c1cb 100644
--- a/source/core/slang-process-util.h
+++ b/source/core/slang-process-util.h
@@ -16,17 +16,48 @@ struct CommandLine
Filename, ///< The executable is set as a filename
};
- void addArg(const String& in) { m_args.add(in); }
- void addArgs(const String* args, Int argsCount) { m_args.addRange(args, argsCount); }
+ enum class ArgType
+ {
+ Escaped,
+ Unescaped,
+ };
+
+ struct Arg
+ {
+ ArgType type; ///< How to interpret the argument value
+ String value; ///< The argument value
+ };
+
+ /// Add args - assumed unescaped
+ void addArg(const String& in) { m_args.add(Arg{ArgType::Unescaped, in}); }
+ void addArgs(const String* args, Int argsCount) { for (Int i = 0; i < argsCount; ++i) addArg(args[i]); }
+
+ /// Add args - all assumed unescaped
+ void addArgs(const Arg* args, Int argCount) { m_args.addRange(args, argCount); }
+
+ /// Add an escaped arg
+ void addEscapedArg(const String& in) { m_args.add(Arg{ArgType::Escaped, in}); }
+ void addEscapedArgs(const String* args, Int argsCount) { for (Int i = 0; i < argsCount; ++i) addEscapedArg(args[i]); }
+
+ /// Find the index of an arg which is exact match for slice
+ SLANG_INLINE Index findArgIndex(const UnownedStringSlice& slice) const;
+
+ /// Set the executable path
void setExecutablePath(const String& path) { m_executableType = ExecutableType::Path; m_executable = path; }
void setExecutableFilename(const String& filename) { m_executableType = ExecutableType::Filename; m_executable = filename; }
+ /// For handling args where the switch is placed directly in front of the path
+ SLANG_INLINE void addPrefixPathArg(const char* prefix, const String& path, const char* pathPostfix = nullptr);
+
+ /// Get the total number of args
+ SLANG_FORCE_INLINE Index getArgCount() const { return m_args.getCount(); }
+
/// Ctor
CommandLine():m_executableType(ExecutableType::Unknown) {}
ExecutableType m_executableType; ///< How the executable is specified
- String m_executable; ///< Executable to run
- List<String> m_args; ///< The parameters to pass
+ String m_executable; ///< Executable to run. Note that the executable is never escaped.
+ List<Arg> m_args; ///< The arguments
};
struct ExecuteResult
@@ -59,6 +90,43 @@ struct ProcessUtil
static void appendCommandLineEscaped(const UnownedStringSlice& slice, StringBuilder& out);
};
+// -----------------------------------------------------------------------
+SLANG_INLINE Index CommandLine::findArgIndex(const UnownedStringSlice& slice) const
+{
+ const Index count = m_args.getCount();
+
+ for (Index i = 0; i < count; ++i)
+ {
+ const auto& arg = m_args[i];
+ if (arg.value == slice)
+ {
+ return i;
+ }
+ }
+ return -1;
+}
+
+// -----------------------------------------------------------------------
+SLANG_INLINE void CommandLine::addPrefixPathArg(const char* prefix, const String& path, const char* pathPostfix)
+{
+ StringBuilder builder;
+ builder << prefix;
+ if (pathPostfix)
+ {
+ // Work out the path with the postfix
+ StringBuilder fullPath;
+ fullPath << path << pathPostfix;
+ ProcessUtil::appendCommandLineEscaped(fullPath.getUnownedSlice(), builder);
+ }
+ else
+ {
+ ProcessUtil::appendCommandLineEscaped(path.getUnownedSlice(), builder);
+ }
+
+ // This arg doesn't need subsequent escaping
+ addEscapedArg(builder);
+}
+
}
#endif // SLANG_PROCESS_UTIL_H
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);
diff --git a/source/core/windows/slang-win-process-util.cpp b/source/core/windows/slang-win-process-util.cpp
index 680864acb..ac6468109 100644
--- a/source/core/windows/slang-win-process-util.cpp
+++ b/source/core/windows/slang-win-process-util.cpp
@@ -154,35 +154,7 @@ static DWORD WINAPI _readerThreadProc(LPVOID threadParam)
return UnownedStringSlice::fromLiteral(".exe");
}
-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)
+/* static */void ProcessUtil::appendCommandLineEscaped(const UnownedStringSlice& slice, StringBuilder& out)
{
// TODO(JS): This escaping is not complete... !
@@ -218,23 +190,6 @@ static void _appendCommandLineEscaped(const UnownedStringSlice& slice, StringBui
}
}
-/* 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;
@@ -242,7 +197,14 @@ static void _appendCommandLineEscaped(const UnownedStringSlice& slice, StringBui
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();
}
diff --git a/source/core/windows/slang-win-visual-studio-util.cpp b/source/core/windows/slang-win-visual-studio-util.cpp
index 5fc56d091..b7de7607c 100644
--- a/source/core/windows/slang-win-visual-studio-util.cpp
+++ b/source/core/windows/slang-win-visual-studio-util.cpp
@@ -373,9 +373,7 @@ static SlangResult _find(int versionIndex, WinVisualStudioUtil::VersionPath& out
// /Fd - followed by name of the pdb file
if (options.debugInfoType != DebugInfoType::None)
{
- StringBuilder builder;
- builder << "/Fd" << options.modulePath << ".pdb";
- cmdLine.addArg(builder);
+ cmdLine.addPrefixPathArg("/Fd", options.modulePath, ".pdb");
}
switch (options.targetType)
@@ -392,28 +390,20 @@ static SlangResult _find(int versionIndex, WinVisualStudioUtil::VersionPath& out
cmdLine.addArg("/LD");
}
- StringBuilder builder;
- builder << "/Fe" << options.modulePath << ".dll";
- cmdLine.addArg(builder);
+ cmdLine.addPrefixPathArg("/Fe", options.modulePath, ".dll");
break;
}
case TargetType::Executable:
{
- StringBuilder builder;
- builder << "/Fe" << options.modulePath << ".exe";
- cmdLine.addArg(builder);
+ cmdLine.addPrefixPathArg("/Fe", options.modulePath, ".exe");
break;
}
default: break;
}
// Object file specify it's location - needed if we are out
- {
- StringBuilder builder;
- builder << "/Fo" << options.modulePath << ".obj";
- cmdLine.addArg(builder);
- }
-
+ cmdLine.addPrefixPathArg("/Fo", options.modulePath, ".obj");
+
// Add defines
for (const auto& define : options.defines)
{
@@ -434,7 +424,6 @@ static SlangResult _find(int versionIndex, WinVisualStudioUtil::VersionPath& out
cmdLine.addArg(include);
}
-
// https://docs.microsoft.com/en-us/cpp/build/reference/eh-exception-handling-model?view=vs-2019
// /Eha - Specifies the model of exception handling. (a, s, c, r are options)
@@ -450,10 +439,7 @@ static SlangResult _find(int versionIndex, WinVisualStudioUtil::VersionPath& out
for (const auto& libPath : options.libraryPaths)
{
// Note that any escaping of the path is handled in the ProcessUtil::
- StringBuilder builder;
- builder << "/LIBPATH:" << libPath;
-
- cmdLine.addArg(builder);
+ cmdLine.addPrefixPathArg("/LIBPATH:", libPath);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 23:03:57 +0000