RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:37:35 +00:00
Code Issues Activity Actions

LibCore+LibFileSystem: Move resolve_executable_from_environment to Core

Browse source
This commit is contained in:
Ben Wiederhake 2023-05-29 22:15:13 +02:00 • committed by Jelle Raaijmakers
parent 00bd443d1c
commit 26efdf9d4f
3 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Userland/Libraries/LibCore/System.cpp
View file

@ -1655,4 +1655,39 @@ ErrorOr<void> posix_fallocate(int fd, off_t offset, off_t length)
}
#endif
// This constant is copied from LibFileSystem. We cannot use or even include it directly,
// because that would cause a dependency of LibCore on LibFileSystem, effectively rendering
// the distinction between these libraries moot.
static constexpr StringView INTERNAL_DEFAULT_PATH_SV = "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"sv;
ErrorOr<String> resolve_executable_from_environment(StringView filename, int flags)
{
if (filename.is_empty())
return Error::from_errno(ENOENT);
// Paths that aren't just a file name generally count as already resolved.
if (filename.contains('/')) {
TRY(Core::System::access(filename, X_OK, flags));
return TRY(String::from_utf8(filename));
}
auto const* path_str = ::getenv("PATH");
StringView path;
if (path_str)
path = { path_str, strlen(path_str) };
if (path.is_empty())
path = INTERNAL_DEFAULT_PATH_SV;
auto directories = path.split_view(':');
for (auto directory : directories) {
auto file = TRY(String::formatted("{}/{}", directory, filename));
if (!Core::System::access(file, X_OK, flags).is_error())
return file;
}
return Error::from_errno(ENOENT);
}
}

2
Userland/Libraries/LibCore/System.h
View file

@ -267,4 +267,6 @@ ErrorOr<AddressInfoVector> getaddrinfo(char const* nodename, char const* servnam
ErrorOr<void> posix_fallocate(int fd, off_t offset, off_t length);
#endif
ErrorOr<String> resolve_executable_from_environment(StringView filename, int flags = 0);
}

28
Userland/Libraries/LibFileSystem/FileSystem.cpp
View file

@ -361,32 +361,8 @@ ErrorOr<void> link_file(StringView destination_path, StringView source_path)
ErrorOr<String> resolve_executable_from_environment(StringView filename, int flags)
{
if (filename.is_empty())
return Error::from_errno(ENOENT);
// Paths that aren't just a file name generally count as already resolved.
if (filename.contains('/')) {
TRY(Core::System::access(filename, X_OK, flags));
return TRY(String::from_utf8(filename));
}
auto const* path_str = ::getenv("PATH");
StringView path;
if (path_str)
path = { path_str, strlen(path_str) };
if (path.is_empty())
path = DEFAULT_PATH_SV;
auto directories = path.split_view(':');
for (auto directory : directories) {
auto file = TRY(String::formatted("{}/{}", directory, filename));
if (!Core::System::access(file, X_OK, flags).is_error())
return file;
}
return Error::from_errno(ENOENT);
// FIXME: Callers should Call Core::System::resolve_executable_from_environment instead of FileSystem::resolve_executable_from_environment.
return Core::System::resolve_executable_from_environment(filename, flags);
}
bool looks_like_shared_library(StringView path)