summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-11 15:05:20 (GMT)
committerBrad King <brad.king@kitware.com>2017-09-13 14:47:04 (GMT)
commit31f73eb12dd0888efc61c0333539d1354c7268ce (patch)
tree11eddb116df6844f7e534a03f213b7ce07a56fba /Source/cmSystemTools.h
parent3f8c6cab4bb4a9f68708c11a38e4487dad363e38 (diff)
downloadCMake-31f73eb12dd0888efc61c0333539d1354c7268ce.zip
CMake-31f73eb12dd0888efc61c0333539d1354c7268ce.tar.gz
CMake-31f73eb12dd0888efc61c0333539d1354c7268ce.tar.bz2
get_filename_component: Revise PROGRAM/PROGRAM_ARGS split semantics
The KWSys `SystemTools::SplitProgramFromArgs` implementation goes into an infinite loop when the value is just " " (a space). Since the "program path with unquoted spaces plus command-line arguments" operation it is trying to provide is poorly defined (string parsing should not depend on filesystem content), just stop using it. Instead consider the main two use cases the old approach tried to handle: * The value is the name or absolute path of a program with no quoting or escaping, but also no command-line arguments. In this case we can use the value as given with no parsing, and assume no arguments. * The value is a command-line string containing the program name/path plus arguments. In this case we now assume that the command line is properly quoted or escaped. Fixes: #17262
Diffstat (limited to 'Source/cmSystemTools.h')
-rw-r--r--Source/cmSystemTools.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 9bec361..e7082e6 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -255,6 +255,11 @@ public:
static void ParseUnixCommandLine(const char* command,
std::vector<std::string>& args);
+ /** Split a command-line string into the parsed command and the unparsed
+ arguments. Returns false on unfinished quoting or escaping. */
+ static bool SplitProgramFromArgs(std::string const& command,
+ std::string& program, std::string& args);
+
/**
* Handle response file in an argument list and return a new argument list
* **/