From 22a759b5b548036e980992aeead9c49cfe40bafb Mon Sep 17 00:00:00 2001 From: KWSys Upstream Date: Wed, 29 Nov 2023 07:53:40 -0500 Subject: KWSys 2023-11-29 (433f3d23) Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 433f3d23ffa37f8fa6dd42468933f36c28a9e7fa (master). Upstream Shortlog ----------------- Brad King (1): 9f9ff427 SystemTools: Teach RemoveADirectory to handle non-readable directories --- SystemTools.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SystemTools.cxx b/SystemTools.cxx index cefb922..53b55f6 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -2794,14 +2794,14 @@ Status SystemTools::RemoveFile(std::string const& source) Status SystemTools::RemoveADirectory(std::string const& source) { - // Add write permission to the directory so we can modify its - // content to remove files and directories from it. + // Add read and write permission to the directory so we can read + // and modify its content to remove files and directories from it. mode_t mode = 0; if (SystemTools::GetPermissions(source, mode)) { #if defined(_WIN32) && !defined(__CYGWIN__) - mode |= S_IWRITE; + mode |= S_IREAD | S_IWRITE; #else - mode |= S_IWUSR; + mode |= S_IRUSR | S_IWUSR; #endif SystemTools::SetPermissions(source, mode); } -- cgit v0.12 From 5589bcb1bf3b7bf6ac74f91d59efb736eb0dc932 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 28 Nov 2023 09:43:17 -0500 Subject: Tests: Fix directory removal in RunCMake.if test --- Tests/RunCMake/if/FilePermissions.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Tests/RunCMake/if/FilePermissions.cmake b/Tests/RunCMake/if/FilePermissions.cmake index 7881b5f..9d5db64 100644 --- a/Tests/RunCMake/if/FilePermissions.cmake +++ b/Tests/RunCMake/if/FilePermissions.cmake @@ -13,9 +13,11 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/executable.txt" "foo") file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/executable.txt" PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) if(NOT WIN32) - file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/readable-dir" - "${CMAKE_CURRENT_BINARY_DIR}/writable-dir" - "${CMAKE_CURRENT_BINARY_DIR}/executable-dir") + file(REMOVE_RECURSE + "${CMAKE_CURRENT_BINARY_DIR}/readable-dir" + "${CMAKE_CURRENT_BINARY_DIR}/writable-dir" + "${CMAKE_CURRENT_BINARY_DIR}/executable-dir" + ) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/readable-dir") file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/readable-dir" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) -- cgit v0.12 From 2e82ba70b34fe83db22c3fa276c7968c291ea84c Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 28 Nov 2023 08:59:58 -0500 Subject: Tests: Avoid creating world-writable paths These were added by commit 337bc5662c (if(): add operators IS_READABLE, IS_WRITABLE and IS_EXECUTABLE., 2023-10-21) but are not actually necessary. --- Tests/RunCMake/if/FilePermissions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/RunCMake/if/FilePermissions.cmake b/Tests/RunCMake/if/FilePermissions.cmake index 9d5db64..f62b107 100644 --- a/Tests/RunCMake/if/FilePermissions.cmake +++ b/Tests/RunCMake/if/FilePermissions.cmake @@ -7,7 +7,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/readable.txt" "foo") file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/readable.txt" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/writable.txt" "foo") -file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/writable.txt" PERMISSIONS OWNER_WRITE GROUP_WRITE WORLD_WRITE) +file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/writable.txt" PERMISSIONS OWNER_WRITE GROUP_WRITE) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/executable.txt" "foo") file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/executable.txt" PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) @@ -23,7 +23,7 @@ if(NOT WIN32) file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/readable-dir" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/writable-dir") - file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/writable-dir" PERMISSIONS OWNER_WRITE GROUP_WRITE WORLD_WRITE) + file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/writable-dir" PERMISSIONS OWNER_WRITE GROUP_WRITE) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/executable-dir") file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/executable-dir" PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) -- cgit v0.12 From 9718c312b60e294603c3c352970be3b4c5011877 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 28 Nov 2023 09:03:56 -0500 Subject: Tests: Avoid leaving behind non-readable directories Since commit 337bc5662c (if(): add operators IS_READABLE, IS_WRITABLE and IS_EXECUTABLE., 2023-10-21) we create some non-readable directories. CMake 3.28 and below do not know how to delete them, so some nightly builds fail ctest_empty_binary_directory. Add read permission to those directories when we are finished with them. --- Tests/RunCMake/if/FilePermissions.cmake | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Tests/RunCMake/if/FilePermissions.cmake b/Tests/RunCMake/if/FilePermissions.cmake index f62b107..9edbddb 100644 --- a/Tests/RunCMake/if/FilePermissions.cmake +++ b/Tests/RunCMake/if/FilePermissions.cmake @@ -29,34 +29,47 @@ if(NOT WIN32) file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/executable-dir" PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) endif() +function(cleanup) + if(NOT WIN32) + # CMake versions prior to 3.29 did not know how to remove non-readable directories. + file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/writable-dir" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_WRITE) + file(CHMOD "${CMAKE_CURRENT_BINARY_DIR}/executable-dir" PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) + endif() +endfunction() + if(WIN32) # files are always readable and executable # directories are always, readable, writable and executable if(NOT IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/readable.txt" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/readable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/readable.txt\" failed") endif() if(NOT IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/executable.txt" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/executable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/executable.txt\" failed") endif() else() if(NOT IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/readable.txt" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/readable.txt" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/readable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/readable.txt\" failed") endif() if(NOT IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/writable.txt" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/writable.txt" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/writable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/writable.txt\" failed") endif() if(NOT IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/executable.txt" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/executable.txt" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/executable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/executable.txt\" failed") endif() @@ -64,18 +77,21 @@ else() if(NOT IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/readable-dir" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/readable-dir" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/readable-dir") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/readable-dir\" failed") endif() if(NOT IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/writable-dir" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/writable-dir" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/writable-dir") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/writable-dir\" failed") endif() if(NOT IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/executable-dir" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/executable-dir" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/executable-dir") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/executable.txt\" failed") endif() endif() @@ -119,18 +135,21 @@ if(UNIX) if(NOT IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-readable.txt" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-readable.txt" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-readable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/link-to-readable.txt\" failed") endif() if(NOT IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-writable.txt" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-writable.txt" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-writable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/link-to-writable.txt\" failed") endif() if(NOT IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-executable.txt" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-executable.txt" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-executable.txt") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/link-to-executable.txt\" failed") endif() @@ -138,18 +157,23 @@ if(UNIX) if(NOT IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-readable-dir" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-readable-dir" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-readable-dir") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/link-to-readable-dir\" failed") endif() if(NOT IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-writable-dir" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-writable-dir" OR IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-writable-dir") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/link-to-writable-dir\" failed") endif() if(NOT IS_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-executable-dir" OR IS_READABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-executable-dir" OR IS_WRITABLE "${CMAKE_CURRENT_BINARY_DIR}/link-to-executable-dir") + cleanup() message(FATAL_ERROR "checks on \"${CMAKE_CURRENT_BINARY_DIR}/link-to-executable-dir\" failed") endif() endif() + +cleanup() -- cgit v0.12