summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp14
-rw-r--r--src/buildtool/file_system/file_root.hpp7
-rw-r--r--src/buildtool/file_system/file_system_manager.hpp108
3 files changed, 72 insertions, 57 deletions
diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
index 6a8ebb87..2f3dbc01 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
@@ -509,9 +509,7 @@ auto BazelMsgFactory::CreateDirectoryDigestFromLocalTree(
// create and store file
try {
const auto full_name = root / name;
- const bool is_executable =
- FileSystemManager::IsExecutable(full_name, true);
- if (auto digest = store_file(full_name, is_executable)) {
+ if (auto digest = store_file(full_name, IsExecutableObject(type))) {
auto file = CreateFileNode(name.string(), type, {});
file.set_allocated_digest(gsl::owner<bazel_re::Digest*>{
new bazel_re::Digest{std::move(*digest)}});
@@ -568,15 +566,11 @@ auto BazelMsgFactory::CreateGitTreeDigestFromLocalTree(
// create and store file
try {
const auto full_name = root / name;
- const bool is_executable =
- FileSystemManager::IsExecutable(full_name, true);
- if (auto digest = store_file(full_name, is_executable)) {
+ if (auto digest = store_file(full_name, IsExecutableObject(type))) {
if (auto raw_id = FromHexString(
NativeSupport::Unprefix(digest->hash()))) {
- entries[std::move(*raw_id)].emplace_back(
- name.string(),
- is_executable ? ObjectType::Executable
- : ObjectType::File);
+ entries[std::move(*raw_id)].emplace_back(name.string(),
+ type);
return true;
}
}
diff --git a/src/buildtool/file_system/file_root.hpp b/src/buildtool/file_system/file_root.hpp
index 726171b8..a1b21a81 100644
--- a/src/buildtool/file_system/file_root.hpp
+++ b/src/buildtool/file_system/file_root.hpp
@@ -186,8 +186,7 @@ class FileRoot {
if (std::holds_alternative<pairs_t>(data_)) {
auto const& data = std::get<pairs_t>(data_);
auto it = data.find(name);
- return (it != data.end() and
- it->second == ObjectType::File);
+ return (it != data.end() and IsFileObject(it->second));
}
} catch (...) {
}
@@ -238,7 +237,7 @@ class FileRoot {
auto const& data = std::get<pairs_t>(data_);
return Iterator{FilteredIterator{
data.begin(), data.end(), [](auto const& x) {
- return x.second == ObjectType::File;
+ return IsFileObject(x.second);
}}};
}
// std::holds_alternative<tree_t>(data_) == true
@@ -254,7 +253,7 @@ class FileRoot {
auto const& data = std::get<pairs_t>(data_);
return Iterator{FilteredIterator{
data.begin(), data.end(), [](auto const& x) {
- return x.second == ObjectType::Tree;
+ return IsTreeObject(x.second);
}}};
}
diff --git a/src/buildtool/file_system/file_system_manager.hpp b/src/buildtool/file_system/file_system_manager.hpp
index 81246dd5..a9a3db2b 100644
--- a/src/buildtool/file_system/file_system_manager.hpp
+++ b/src/buildtool/file_system/file_system_manager.hpp
@@ -360,7 +360,8 @@ class FileSystemManager {
[[nodiscard]] static auto Exists(std::filesystem::path const& path) noexcept
-> bool {
try {
- return std::filesystem::exists(path);
+ auto const status = std::filesystem::symlink_status(path);
+ return std::filesystem::exists(status);
} catch (std::exception const& e) {
Logger::Log(LogLevel::Error,
"checking for existence of path{}:\n{}",
@@ -375,7 +376,8 @@ class FileSystemManager {
[[nodiscard]] static auto IsFile(std::filesystem::path const& file) noexcept
-> bool {
try {
- if (!std::filesystem::is_regular_file(file)) {
+ auto const status = std::filesystem::symlink_status(file);
+ if (!std::filesystem::is_regular_file(status)) {
return false;
}
} catch (std::exception const& e) {
@@ -392,7 +394,8 @@ class FileSystemManager {
[[nodiscard]] static auto IsDirectory(
std::filesystem::path const& dir) noexcept -> bool {
try {
- return std::filesystem::is_directory(dir);
+ auto const status = std::filesystem::symlink_status(dir);
+ return std::filesystem::is_directory(status);
} catch (std::exception const& e) {
Logger::Log(LogLevel::Error,
"checking if path {} corresponds to a directory:\n{}",
@@ -406,27 +409,14 @@ class FileSystemManager {
/// \brief Checks whether a path corresponds to an executable or not.
/// \param[in] path Path to check
- /// \param[in] is_file_known (Optional) If true, we assume that the path
- /// corresponds to a file, if false, we check if it's a file or not first.
- /// Default value is false
/// \returns true if path corresponds to an executable object, false
/// otherwise
- [[nodiscard]] static auto IsExecutable(std::filesystem::path const& path,
- bool is_file_known = false) noexcept
- -> bool {
- if (not is_file_known and not IsFile(path)) {
- return false;
- }
-
+ [[nodiscard]] static auto IsExecutable(
+ std::filesystem::path const& path) noexcept -> bool {
try {
- namespace fs = std::filesystem;
- auto exec_flags = fs::perms::owner_exec bitor
- fs::perms::group_exec bitor
- fs::perms::others_exec;
- auto exec_perms = fs::status(path).permissions() bitand exec_flags;
- if (exec_perms == fs::perms::none) {
- return false;
- }
+ auto const status = std::filesystem::symlink_status(path);
+ return std::filesystem::is_regular_file(status) and
+ HasExecPermissions(status);
} catch (std::exception const& e) {
Logger::Log(LogLevel::Error,
"checking if path {} corresponds to an executable:\n{}",
@@ -441,23 +431,32 @@ class FileSystemManager {
/// \brief Gets type of object in path according to file system
[[nodiscard]] static auto Type(std::filesystem::path const& path) noexcept
-> std::optional<ObjectType> {
- if (IsFile(path)) {
- if (IsExecutable(path, true)) {
- return ObjectType::Executable;
+ try {
+ auto const status = std::filesystem::symlink_status(path);
+ if (std::filesystem::is_regular_file(status)) {
+ if (HasExecPermissions(status)) {
+ return ObjectType::Executable;
+ }
+ return ObjectType::File;
}
- return ObjectType::File;
- }
- if (IsDirectory(path)) {
- return ObjectType::Tree;
- }
- if (Exists(path)) {
- Logger::Log(LogLevel::Debug,
- "object type for {} is not supported yet.",
- path.string());
- }
- else {
- Logger::Log(
- LogLevel::Trace, "non-existing object path {}.", path.string());
+ if (std::filesystem::is_directory(status)) {
+ return ObjectType::Tree;
+ }
+ if (std::filesystem::exists(status)) {
+ Logger::Log(LogLevel::Debug,
+ "object type for {} is not supported yet.",
+ path.string());
+ }
+ else {
+ Logger::Log(LogLevel::Trace,
+ "non-existing object path {}.",
+ path.string());
+ }
+ } catch (std::exception const& e) {
+ Logger::Log(LogLevel::Error,
+ "checking type of path {} failed with:\n{}",
+ path.string(),
+ e.what());
}
return std::nullopt;
}
@@ -520,20 +519,26 @@ class FileSystemManager {
ReadDirEntryFunc const& read_entry) noexcept -> bool {
try {
for (auto const& entry : std::filesystem::directory_iterator{dir}) {
- std::optional<ObjectType> type{};
- if (entry.is_regular_file()) {
- type = ObjectType::File;
+ ObjectType type{};
+ auto const status = entry.symlink_status();
+ if (std::filesystem::is_regular_file(status)) {
+ if (HasExecPermissions(status)) {
+ type = ObjectType::Executable;
+ }
+ else {
+ type = ObjectType::File;
+ }
}
- else if (entry.is_directory()) {
+ else if (std::filesystem::is_directory(status)) {
type = ObjectType::Tree;
}
- if (not type) {
+ else {
Logger::Log(LogLevel::Error,
"unsupported type for dir entry {}",
entry.path().string());
return false;
}
- if (not read_entry(entry.path().filename(), *type)) {
+ if (not read_entry(entry.path().filename(), type)) {
return false;
}
}
@@ -779,6 +784,23 @@ class FileSystemManager {
return false;
}
}
+
+ static auto HasExecPermissions(
+ std::filesystem::file_status const& status) noexcept -> bool {
+ try {
+ namespace fs = std::filesystem;
+ static constexpr auto exec_flags = fs::perms::owner_exec bitor
+ fs::perms::group_exec bitor
+ fs::perms::others_exec;
+ auto exec_perms = status.permissions() bitand exec_flags;
+ return exec_perms != fs::perms::none;
+ } catch (std::exception const& e) {
+ Logger::Log(LogLevel::Error,
+ "checking for executable permissions failed with:\n{}",
+ e.what());
+ }
+ return false;
+ }
}; // class FileSystemManager
#endif // INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_FILE_SYSTEM_MANAGER_HPP
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-04 10:34:34 +0000