mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmSystemTools: Fix SplitEnvPath to avoid empty paths

Browse Source
This commit is contained in:
Brad King
2024-10-22 09:59:51 -04:00
parent 2503b43b6c
commit 6d57403e14
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmSystemTools.cxx
View File

@@ -1614,14 +1614,27 @@ cm::optional<std::string> cmSystemTools::GetEnvVar(std::string const& var)
return result;
}
std::vector<std::string> cmSystemTools::SplitEnvPath(std::string const& value)
std::vector<std::string> cmSystemTools::SplitEnvPath(cm::string_view in)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
static cm::string_view sep = ";"_s;
#else
static cm::string_view sep = ":"_s;
#endif
std::vector<std::string> paths = cmTokenize(value, sep);
std::vector<std::string> paths;
cm::string_view::size_type e = 0;
for (;;) {
cm::string_view::size_type b = in.find_first_not_of(sep, e);
if (b == cm::string_view::npos) {
break;
}
e = in.find_first_of(sep, b);
if (e == cm::string_view::npos) {
paths.emplace_back(in.substr(b));
break;
}
paths.emplace_back(in.substr(b, e - b));
}
for (std::string& p : paths) {
SystemTools::ConvertToUnixSlashes(p);
}

3
Source/cmSystemTools.h
View File

@@ -399,7 +399,8 @@ public:
std::string const& in);
static cm::optional<std::string> GetEnvVar(std::string const& var);
static std::vector<std::string> SplitEnvPath(std::string const& value);
static std::vector<std::string> SplitEnvPath(cm::string_view in);
static std::string ToNormalizedPathOnDisk(std::string p);