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

KWSys 2022-06-21 (d427a180)

Browse Source 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit d427a18072e2f37108aeeadf41ed4a21b4be3ab1 (master).

Upstream Shortlog
-----------------

Clemens Wasser (2):
      ab7c8f6f SystemTools: Factor out RemoveTrailingSlashes
      ca9646bd SystemTools: Optimize FileIsExecutable on Windows
This commit is contained in:
KWSys Upstream
2022-06-21 10:17:54 -04:00
committed by Brad King
parent 975c44654d
commit 02dbf65dee
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
SystemTools.cxx
View File

@@ -3067,17 +3067,14 @@ std::string SystemTools::GetRealPath(const std::string& path,
return ret;
}
bool SystemTools::FileIsDirectory(const std::string& inName)
// Remove any trailing slash from the name except in a root component.
static const char* RemoveTrailingSlashes(
const std::string& inName, char (&local_buffer)[KWSYS_SYSTEMTOOLS_MAXPATH],
std::string& string_buffer)
{
if (inName.empty()) {
return false;
}
size_t length = inName.size();
const char* name = inName.c_str();
// Remove any trailing slash from the name except in a root component.
char local_buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
std::string string_buffer;
size_t last = length - 1;
if (last > 0 && (name[last] == '/' || name[last] == '\\') &&
strcmp(name, "/") != 0 && name[last - 1] != ':') {
@@ -3091,6 +3088,19 @@ bool SystemTools::FileIsDirectory(const std::string& inName)
}
}
return name;
}
bool SystemTools::FileIsDirectory(const std::string& inName)
{
if (inName.empty()) {
return false;
}
char local_buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
std::string string_buffer;
const auto name = RemoveTrailingSlashes(inName, local_buffer, string_buffer);
// Now check the file node type.
#if defined(_WIN32)
DWORD attr =
@@ -3107,9 +3117,21 @@ bool SystemTools::FileIsDirectory(const std::string& inName)
}
}
bool SystemTools::FileIsExecutable(const std::string& name)
bool SystemTools::FileIsExecutable(const std::string& inName)
{
return !FileIsDirectory(name) && TestFileAccess(name, TEST_FILE_EXECUTE);
#ifdef _WIN32
char local_buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
std::string string_buffer;
const auto name = RemoveTrailingSlashes(inName, local_buffer, string_buffer);
const auto attr =
GetFileAttributesW(Encoding::ToWindowsExtendedPath(name).c_str());
// On Windows any file that exists and is not a directory is considered
// readable and therefore also executable:
return attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY);
#else
return !FileIsDirectory(inName) && TestFileAccess(inName, TEST_FILE_EXECUTE);
#endif
}
#if defined(_WIN32)