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

cmSystemTools: Improve CreateLink and CreateSymlink error codes

Browse Source 
In commit 7f89053953 (cmSystemTools: Return KWSys Status from CreateLink
and CreateSymlink, 2021-04-15) we just took the `-err` from libuv and
treated it as a POSIX error.  This is accurate on POSIX, but on Windows
does not match the POSIX error codes.

Use `uv_fs_get_system_error` to get the actual system error code.
This requires libuv 1.38 or higher.  Require that for Windows, but
fall back to the previous approach on POSIX.
This commit is contained in:
Brad King
2021-05-06 10:39:05 -04:00
parent e0b4a22ca6
commit d7522b8f86
7 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -644,7 +644,11 @@ macro (CMAKE_BUILD_UTILITIES)
#---------------------------------------------------------------------
# Build libuv library.
if(CMAKE_USE_SYSTEM_LIBUV)
find_package(LibUV 1.10.0)
if(WIN32)
find_package(LibUV 1.38.0)
else()
find_package(LibUV 1.10.0)
endif()
if(NOT LIBUV_FOUND)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")

18
Source/cmSystemTools.cxx
View File

@@ -3173,9 +3173,15 @@ cmsys::Status cmSystemTools::CreateSymlink(std::string const& origName,
flags, nullptr);
cmsys::Status status;
if (err) {
#if defined(_WIN32)
status = cmsys::Status::Windows(uv_fs_get_system_error(&req));
#elif UV_VERSION_MAJOR > 1 || (UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR >= 38)
status = cmsys::Status::POSIX(uv_fs_get_system_error(&req));
#else
status = cmsys::Status::POSIX(-err);
std::string e =
"failed to create symbolic link '" + newName + "': " + uv_strerror(err);
#endif
std::string e = cmStrCat("failed to create symbolic link '", newName,
"': ", status.GetString());
if (errorMessage) {
*errorMessage = std::move(e);
} else {
@@ -3194,9 +3200,15 @@ cmsys::Status cmSystemTools::CreateLink(std::string const& origName,
uv_fs_link(nullptr, &req, origName.c_str(), newName.c_str(), nullptr);
cmsys::Status status;
if (err) {
#if defined(_WIN32)
status = cmsys::Status::Windows(uv_fs_get_system_error(&req));
#elif UV_VERSION_MAJOR > 1 || (UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR >= 38)
status = cmsys::Status::POSIX(uv_fs_get_system_error(&req));
#else
status = cmsys::Status::POSIX(-err);
#endif
std::string e =
"failed to create link '" + newName + "': " + uv_strerror(err);
cmStrCat("failed to create link '", newName, "': ", status.GetString());
if (errorMessage) {
*errorMessage = std::move(e);
} else {

2
Tests/RunCMake/CommandLine/E_create_hardlink-no-directory-stderr.txt
View File

@@ -1 +1 @@
^CMake Error: failed to create link .* no such file or directory
^CMake Error: failed to create link '[^']+': [A-Za-z]

2
Tests/RunCMake/CommandLine/E_create_hardlink-unresolved-symlink-prereq-check.cmake
View File

@@ -1,3 +1,3 @@
if(${actual_stderr_var} MATCHES "operation not permitted")
if(${actual_stderr_var} MATCHES "A required privilege is not held by the client")
unset(msg)
endif()

2
Tests/RunCMake/CommandLine/E_create_symlink-broken-create-check.cmake
View File

@@ -1,4 +1,4 @@
if(${actual_stderr_var} MATCHES "operation not permitted")
if(${actual_stderr_var} MATCHES "A required privilege is not held by the client")
unset(msg)
else()
if(NOT IS_SYMLINK ${RunCMake_TEST_BINARY_DIR}/L)

2
Tests/RunCMake/CommandLine/E_create_symlink-broken-replace-check.cmake
View File

@@ -1,4 +1,4 @@
if(${actual_stderr_var} MATCHES "operation not permitted")
if(${actual_stderr_var} MATCHES "A required privilege is not held by the client")
unset(msg)
else()
if(NOT IS_DIRECTORY ${RunCMake_TEST_BINARY_DIR}/L)

4
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@@ -359,7 +359,7 @@ run_cmake_command(E_create_symlink-missing-dir
# These tests are special on Windows since it will only fail if the user
# running the test does not have the priveldge to create symlinks. If this
# happens we clear the msg in the -check.cmake and say that the test passes
set(RunCMake_DEFAULT_stderr "(operation not permitted)?")
set(RunCMake_DEFAULT_stderr "(A required privilege is not held by the client)?")
set(RunCMake_TEST_BINARY_DIR
${RunCMake_BINARY_DIR}/E_create_symlink-broken-build)
set(RunCMake_TEST_NO_CLEAN 1)
@@ -403,7 +403,7 @@ run_cmake_command(E_create_hardlink-no-directory
#On Windows, if the user does not have sufficient privileges
#don't fail this test
set(RunCMake_DEFAULT_stderr "(operation not permitted)?")
set(RunCMake_DEFAULT_stderr "(A required privilege is not held by the client)?")
run_cmake_command(E_create_hardlink-unresolved-symlink-prereq
${CMAKE_COMMAND} -E create_symlink ${dir}/1 ${dir}/1-symlink
)