RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:48:11 +00:00
Code Issues Activity Actions

LibFileSystem+Everywhere: Return ByteString current_working_directory()

Browse source 
That is, return it *from* current_working_directory(), but I didn't have
room. :^)
This commit is contained in:
Sam Atkins 2024-01-15 16:01:39 +00:00 • committed by Sam Atkins
parent a7fbb7fd0b
commit fb644d08ac
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meta/Lagom/Tools/ConfigureComponents/main.cpp
View file

@ -234,7 +234,7 @@ int main()
auto current_working_directory = FileSystem::current_working_directory(); auto current_working_directory = FileSystem::current_working_directory();
if (current_working_directory.is_error()) if (current_working_directory.is_error())
return 1; return 1;
auto lexical_cwd = LexicalPath(current_working_directory.release_value().to_byte_string()); auto lexical_cwd = LexicalPath(current_working_directory.release_value());
auto& parts = lexical_cwd.parts_view(); auto& parts = lexical_cwd.parts_view();
if (parts.size() < 2 || parts[parts.size() - 2] != "Build") { if (parts.size() < 2 || parts[parts.size() - 2] != "Build") {
warnln("\e[31mError:\e[0m This program needs to be executed from inside 'Build/*'."); warnln("\e[31mError:\e[0m This program needs to be executed from inside 'Build/*'.");

2
Userland/Applications/FileManager/main.cpp
View file

@ -142,7 +142,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
if (auto error_or_cwd = FileSystem::current_working_directory(); initial_location.is_empty() && !error_or_cwd.is_error()) if (auto error_or_cwd = FileSystem::current_working_directory(); initial_location.is_empty() && !error_or_cwd.is_error())
initial_location = error_or_cwd.release_value().to_byte_string(); initial_location = error_or_cwd.release_value();
if (initial_location.is_empty()) if (initial_location.is_empty())
initial_location = Core::StandardPaths::home_directory(); initial_location = Core::StandardPaths::home_directory();

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

@ -23,10 +23,9 @@
namespace FileSystem { namespace FileSystem {
ErrorOr<String> current_working_directory() ErrorOr<ByteString> current_working_directory()
{ {
auto cwd = TRY(Core::System::getcwd()); return Core::System::getcwd();
return TRY(String::from_byte_string({ cwd }));
} }
ErrorOr<String> absolute_path(StringView path) ErrorOr<String> absolute_path(StringView path)

2
Userland/Libraries/LibFileSystem/FileSystem.h
View file

@ -18,7 +18,7 @@ namespace FileSystem {
#define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin" #define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"
#define DEFAULT_PATH_SV "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"sv #define DEFAULT_PATH_SV "/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"sv
ErrorOr<String> current_working_directory(); ErrorOr<ByteString> current_working_directory();
ErrorOr<String> absolute_path(StringView path); ErrorOr<String> absolute_path(StringView path);
ErrorOr<String> real_path(StringView path); ErrorOr<String> real_path(StringView path);