mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 02:39:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

get_filename_component: Fix REALPATH for .. after symlink

Browse Source 
Fixes: #26472
This commit is contained in:
U2FsdGVkX1
2024-11-21 07:40:54 -05:00
committed by Brad King
parent 049c449537
commit c554437733
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGetFilenameComponentCommand.cxx
View File

@@ -107,9 +107,15 @@ bool cmGetFilenameComponentCommand(std::vector<std::string> const& args,
}
}
}
// Collapse the path to its simplest form.
result = cmSystemTools::CollapseFullPath(filename, baseDir);
if (args[2] == "REALPATH") {
if (args[2] == "ABSOLUTE") {
// Collapse the path to its simplest form.
result = cmSystemTools::CollapseFullPath(filename, baseDir);
} else {
// Convert relative paths to absolute paths
result = filename;
if (!cmSystemTools::FileIsFullPath(result)) {
result = cmStrCat(baseDir, '/', result);
}
// Resolve symlinks if possible
result = cmSystemTools::GetRealPath(result);
}

8
Tests/RunCMake/get_filename_component/KnownComponents.cmake
View File

@@ -159,3 +159,11 @@ foreach(thisVar ${non_cache_vars})
message(SEND_ERROR "${thisVar} not found in regular variable list.")
endif()
endforeach()
if(UNIX)
file(MAKE_DIRECTORY . "${CMAKE_CURRENT_BINARY_DIR}/subdir")
file(CREATE_LINK . "${CMAKE_CURRENT_BINARY_DIR}/subdir/symlink-to-dot" SYMBOLIC)
get_filename_component(realpath_actual "${CMAKE_CURRENT_BINARY_DIR}/subdir/symlink-to-dot/.." REALPATH)
get_filename_component(realpath_expect "${CMAKE_CURRENT_BINARY_DIR}" REALPATH)
check("symlink parent" "${realpath_actual}" "${realpath_expect}")
endif(UNIX)