2025-08-29 Regressions Fixes (#1774)

BillyONeal · web-flow · commit bc1a57d9fd54 · 2025-09-03T12:32:54.000-07:00
* [Hotfix] Don't fail to enumerate file trees with broken symlink. Resolves the 'fastdds' failures observed in microsoft/vcpkg#47130 Note that the POSIX version of these functions already filter for ENOENT and ENOTDIR: if (::stat(full.c_str(), &s) != 0) { if (errno == ENOENT || errno == ENOTDIR) { ec.clear(); } * Add a Linux cmake preset that does not require node.js to be installed. * [Hotfix] Don't fail to enumerate file trees with recursive symlinks Fixes the wcslib:x64-android failures. * [Hotfix] Harden filesystem ops in write_sbom. Hopefully fixes: error: open_for_read("/mnt/vcpkg-ci/p/salome-configuration_x64-linux/share/salome-configuration/copyright/modules.info"): Permission denied
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,21 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "vcpkg linux debug",
+      "type": "cppdbg",
+      "request": "launch",
+      "environment": [
+        {
+          "name": "VCPKG_ROOT",
+          "value": "/vcpkg"
+        }
+      ],
+      "program": "${workspaceRoot}/out/build/linux-debug/vcpkg",
+      "cwd": "${workspaceRoot}/out/build/linux-debug",
+      "args": [
+      ]
+    },
     {
       "name": "vcpkg-ce cli",
       "request": "launch",
@@ -20,7 +35,7 @@
     },
     {
       "name": "MochaTest",
-      "type": "pwa-node",
+      "type": "node",
       "request": "attach",
       "port": 9229,
       "continueOnAttach": true,
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -135,6 +135,17 @@
                 "artifacts"
             ]
         },
+        {
+            "name": "linux-debug",
+            "inherits": [
+                "base",
+                "debug",
+                "linux"
+            ],
+            "cacheVariables": {
+                "VCPKG_WARNINGS_AS_ERRORS": true
+            }
+        },
         {
             "name": "linux-ci",
             "inherits": [
@@ -217,6 +228,10 @@
             "name": "windows-ci",
             "configurePreset": "windows-ci"
         },
+        {
+            "name": "linux-debug",
+            "configurePreset": "linux-debug"
+        },
         {
             "name": "linux-ci",
             "configurePreset": "linux-ci"
@@ -239,6 +254,10 @@
             "name": "windows-ci",
             "configurePreset": "windows-ci"
         },
+        {
+            "name": "linux-debug",
+            "configurePreset": "linux-debug"
+        },
         {
             "name": "linux-ci",
             "configurePreset": "linux-ci"
diff --git a/azure-pipelines/e2e-ports/broken-symlink/portfile.cmake b/azure-pipelines/e2e-ports/broken-symlink/portfile.cmake
@@ -0,0 +1,20 @@
+# This block is more or less identical to vcpkg-hello-world-1 because that ensures all the
+# post-build checks actually run
+
+set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src")
+file(REMOVE_RECURSE "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/src" DESTINATION "${CURRENT_BUILDTREES_DIR}")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME broken-symlink)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/../../../LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+file(CREATE_LINK "definitely-nonexistent-target-file.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/broken-symlink" SYMBOLIC)
+file(CREATE_LINK "self-symlink-b" "${CURRENT_PACKAGES_DIR}/share/${PORT}/self-symlink-a" SYMBOLIC)
+file(CREATE_LINK "self-symlink-a" "${CURRENT_PACKAGES_DIR}/share/${PORT}/self-symlink-b" SYMBOLIC)
diff --git a/azure-pipelines/e2e-ports/broken-symlink/src/CMakeLists.txt b/azure-pipelines/e2e-ports/broken-symlink/src/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.7.2)
+
+project(broken-symlink CXX)
+
+include(GNUInstallDirs)
+
+add_library(broken-symlink hello.cpp hello.def hello-broken-symlink.h)
+
+install(FILES hello-broken-symlink.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+target_include_directories(broken-symlink INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+
+install(TARGETS broken-symlink EXPORT broken-symlinkConfig)
+
+install(EXPORT broken-symlinkConfig NAMESPACE broken-symlink:: DESTINATION share/broken-symlink)
diff --git a/azure-pipelines/e2e-ports/broken-symlink/src/hello-broken-symlink.h b/azure-pipelines/e2e-ports/broken-symlink/src/hello-broken-symlink.h
@@ -0,0 +1 @@
+extern "C" void hello_symlink_earth();
diff --git a/azure-pipelines/e2e-ports/broken-symlink/src/hello.cpp b/azure-pipelines/e2e-ports/broken-symlink/src/hello.cpp
@@ -0,0 +1,6 @@
+#include <stdio.h>
+#include "hello-broken-symlink.h"
+
+extern "C" void hello_symlink_earth() {
+    puts("hello earth!");
+}
diff --git a/azure-pipelines/e2e-ports/broken-symlink/src/hello.def b/azure-pipelines/e2e-ports/broken-symlink/src/hello.def
@@ -0,0 +1,5 @@
+LIBRARY broken-symlink
+
+EXPORTS
+
+hello_symlink_earth
diff --git a/azure-pipelines/e2e-ports/broken-symlink/vcpkg.json b/azure-pipelines/e2e-ports/broken-symlink/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "broken-symlink",
+  "version": "1",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/azure-pipelines/end-to-end-tests-dir/regression-ports.ps1 b/azure-pipelines/end-to-end-tests-dir/regression-ports.ps1
@@ -1,5 +1,10 @@
 . $PSScriptRoot/../end-to-end-tests-prelude.ps1
 
+Run-Vcpkg install --overlay-ports="$PSScriptRoot/../e2e-ports" --binarysource clear broken-symlink
+Throw-IfFailed
+Run-Vcpkg remove broken-symlink
+Throw-IfFailed
+
 if ($IsWindows) {
     Run-Vcpkg install --overlay-ports="$PSScriptRoot/../e2e-ports/llvm-lto-lib" llvm-lto-lib:x64-windows-static
     Throw-IfFailed
diff --git a/src/vcpkg/base/files.cpp b/src/vcpkg/base/files.cpp
@@ -318,9 +318,14 @@ namespace
 #endif // ^^^ !_WIN32
     }
 
+#if !defined(_WIN32)
+    bool is_not_found_errno_code(int err) { return err == ENOENT || err == ENOTDIR || err == ELOOP; }
+#endif // ^^^ !_WIN32
+
     void translate_not_found_to_success(std::error_code& ec)
     {
-        if (ec && (ec == std::errc::no_such_file_or_directory || ec == std::errc::not_a_directory))
+        if (ec && (ec == std::errc::no_such_file_or_directory || ec == std::errc::not_a_directory ||
+                   ec == std::errc::too_many_symbolic_link_levels))
         {
             ec.clear();
         }
@@ -2660,7 +2665,8 @@ namespace vcpkg
                         ret.push_back(from_stdfs_path(b->path()));
                     }
 
-                    if (ec)
+                    if (ec && ec != std::make_error_condition(std::errc::no_such_file_or_directory) &&
+                        ec != std::make_error_condition(std::errc::not_a_directory))
                     {
                         ret.clear();
                         break;
@@ -2736,7 +2742,8 @@ namespace vcpkg
                         ret.push_back(from_stdfs_path(b->path()));
                     }
 
-                    if (ec)
+                    if (ec && ec != std::make_error_condition(std::errc::no_such_file_or_directory) &&
+                        ec != std::make_error_condition(std::errc::not_a_directory))
                     {
                         ret.clear();
                         break;
@@ -2892,8 +2899,9 @@ namespace vcpkg
                         default:
                             if (::lstat(full.c_str(), &ls) != 0)
                             {
-                                if (errno == ENOENT || errno == ENOTDIR)
+                                if (is_not_found_errno_code(errno))
                                 {
+                                    // report broken symlink as just a symlink rather than the target
                                     ec.clear();
                                 }
                                 else
@@ -2916,8 +2924,9 @@ namespace vcpkg
                                 {
                                     if (::stat(full.c_str(), &s) != 0)
                                     {
-                                        if (errno == ENOENT || errno == ENOTDIR)
+                                        if (is_not_found_errno_code(errno))
                                         {
+                                            // report broken symlink as just a symlink rather than the target
                                             ec.clear();
                                         }
                                         else
@@ -3175,7 +3184,7 @@ namespace vcpkg
                 return posix_translate_stat_mode_to_file_type(s.st_mode);
             }
 
-            if (errno == ENOENT || errno == ENOTDIR)
+            if (is_not_found_errno_code(errno))
             {
                 ec.clear();
                 return FileType::not_found;
@@ -3200,7 +3209,7 @@ namespace vcpkg
                 return posix_translate_stat_mode_to_file_type(s.st_mode);
             }
 
-            if (errno == ENOENT || errno == ENOTDIR)
+            if (is_not_found_errno_code(errno))
             {
                 ec.clear();
                 return FileType::not_found;
@@ -3388,6 +3397,8 @@ namespace vcpkg
             }
 
             const auto remove_errno = errno;
+            // note that this does not treat ELOOP as 'nonexistent' because we still need to remove
+            // the symlink itself
             if (remove_errno == ENOENT || remove_errno == ENOTDIR)
             {
                 ec.clear();
diff --git a/src/vcpkg/commands.build.cpp b/src/vcpkg/commands.build.cpp
@@ -1068,19 +1068,30 @@ namespace vcpkg
         const auto json_path = package_dir / FileShare / action.spec.name() / FileVcpkgSpdxJson;
         // Gather all the files in the package directory
         // Note: For packages with many files, this sequential hashing may be slow
-        const auto relative_package_files =
-            fs.get_regular_files_recursive_lexically_proximate(package_dir, VCPKG_LINE_INFO);
+        std::vector<Path> package_files;
         std::vector<std::string> package_hashes;
-        for (const auto& file : relative_package_files)
         {
-            auto hash = Hash::get_file_hash(fs, package_dir / file, Hash::Algorithm::Sha256);
-            package_hashes.push_back(hash.value_or_exit(VCPKG_LINE_INFO));
-        }
+            auto maybe_relative_package_files = fs.try_get_regular_files_recursive_lexically_proximate(package_dir);
+            if (auto relative_package_files = maybe_relative_package_files.get())
+            {
+                package_files.reserve(relative_package_files->size());
+                package_hashes.reserve(relative_package_files->size());
+                for (auto& file : *relative_package_files)
+                {
+                    auto maybe_hash = Hash::get_file_hash(fs, package_dir / file, Hash::Algorithm::Sha256);
+                    if (auto hash = maybe_hash.get())
+                    {
+                        package_files.push_back(std::move(file));
+                        package_hashes.push_back(std::move(*hash));
+                    }
+                }
+            }
+        } // destroy maybe_relative_package_files
         fs.write_contents_and_dirs(json_path,
                                    create_spdx_sbom(action,
                                                     abi.relative_port_files,
                                                     abi.relative_port_hashes,
-                                                    relative_package_files,
+                                                    package_files,
                                                     package_hashes,
                                                     now,
                                                     doc_ns,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +LIBRARY broken-symlink
++
 +EXPORTS
++
 +hello_symlink_earth
Original file line number	Diff line number	Diff line change
`@@ -318,9 +318,14 @@ namespace`
`318`	`318`	`#endif // ^^^ !_WIN32`
`319`	`319`	`}`
`320`	`320`
	`321`	`+#if !defined(_WIN32)`
	`322`	`+ bool is_not_found_errno_code(int err) { return err == ENOENT \|\| err == ENOTDIR \|\| err == ELOOP; }`
	`323`	`+#endif // ^^^ !_WIN32`
	`324`	`+`
`321`	`325`	`void translate_not_found_to_success(std::error_code& ec)`
`322`	`326`	`{`
`323`		`- if (ec && (ec == std::errc::no_such_file_or_directory \|\| ec == std::errc::not_a_directory))`
	`327`	`+ if (ec && (ec == std::errc::no_such_file_or_directory \|\| ec == std::errc::not_a_directory \|\|`
	`328`	`+ ec == std::errc::too_many_symbolic_link_levels))`
`324`	`329`	`{`
`325`	`330`	`ec.clear();`
`326`	`331`	`}`
`@@ -2660,7 +2665,8 @@ namespace vcpkg`
`2660`	`2665`	`ret.push_back(from_stdfs_path(b->path()));`
`2661`	`2666`	`}`
`2662`	`2667`
`2663`		`- if (ec)`
	`2668`	`+ if (ec && ec != std::make_error_condition(std::errc::no_such_file_or_directory) &&`
	`2669`	`+ ec != std::make_error_condition(std::errc::not_a_directory))`
`2664`	`2670`	`{`
`2665`	`2671`	`ret.clear();`
`2666`	`2672`	`break;`
`@@ -2736,7 +2742,8 @@ namespace vcpkg`
`2736`	`2742`	`ret.push_back(from_stdfs_path(b->path()));`
`2737`	`2743`	`}`
`2738`	`2744`
`2739`		`- if (ec)`
	`2745`	`+ if (ec && ec != std::make_error_condition(std::errc::no_such_file_or_directory) &&`
	`2746`	`+ ec != std::make_error_condition(std::errc::not_a_directory))`
`2740`	`2747`	`{`
`2741`	`2748`	`ret.clear();`
`2742`	`2749`	`break;`
`@@ -2892,8 +2899,9 @@ namespace vcpkg`
`2892`	`2899`	`default:`
`2893`	`2900`	`if (::lstat(full.c_str(), &ls) != 0)`
`2894`	`2901`	`{`
`2895`		`- if (errno == ENOENT \|\| errno == ENOTDIR)`
	`2902`	`+ if (is_not_found_errno_code(errno))`
`2896`	`2903`	`{`
	`2904`	`+ // report broken symlink as just a symlink rather than the target`
`2897`	`2905`	`ec.clear();`
`2898`	`2906`	`}`
`2899`	`2907`	`else`
`@@ -2916,8 +2924,9 @@ namespace vcpkg`
`2916`	`2924`	`{`
`2917`	`2925`	`if (::stat(full.c_str(), &s) != 0)`
`2918`	`2926`	`{`
`2919`		`- if (errno == ENOENT \|\| errno == ENOTDIR)`
	`2927`	`+ if (is_not_found_errno_code(errno))`
`2920`	`2928`	`{`
	`2929`	`+ // report broken symlink as just a symlink rather than the target`
`2921`	`2930`	`ec.clear();`
`2922`	`2931`	`}`
`2923`	`2932`	`else`
`@@ -3175,7 +3184,7 @@ namespace vcpkg`
`3175`	`3184`	`return posix_translate_stat_mode_to_file_type(s.st_mode);`
`3176`	`3185`	`}`
`3177`	`3186`
`3178`		`- if (errno == ENOENT \|\| errno == ENOTDIR)`
	`3187`	`+ if (is_not_found_errno_code(errno))`
`3179`	`3188`	`{`
`3180`	`3189`	`ec.clear();`
`3181`	`3190`	`return FileType::not_found;`
`@@ -3200,7 +3209,7 @@ namespace vcpkg`
`3200`	`3209`	`return posix_translate_stat_mode_to_file_type(s.st_mode);`
`3201`	`3210`	`}`
`3202`	`3211`
`3203`		`- if (errno == ENOENT \|\| errno == ENOTDIR)`
	`3212`	`+ if (is_not_found_errno_code(errno))`
`3204`	`3213`	`{`
`3205`	`3214`	`ec.clear();`
`3206`	`3215`	`return FileType::not_found;`
`@@ -3388,6 +3397,8 @@ namespace vcpkg`
`3388`	`3397`	`}`
`3389`	`3398`
`3390`	`3399`	`const auto remove_errno = errno;`
	`3400`	`+ // note that this does not treat ELOOP as 'nonexistent' because we still need to remove`
	`3401`	`+ // the symlink itself`
`3391`	`3402`	`if (remove_errno == ENOENT \|\| remove_errno == ENOTDIR)`
`3392`	`3403`	`{`
`3393`	`3404`	`ec.clear();`