fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-02-03 14:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibFileSystem+Userland: Return ByteString from absolute_path()

Browse Source
This commit is contained in:
Sam Atkins
2024-01-15 16:10:46 +00:00
committed by Sam Atkins
parent fb644d08ac
commit cdf17efb9a
7 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Userland/Libraries/LibFileSystem/FileSystem.cpp
View File

@@ -28,18 +28,16 @@ ErrorOr<ByteString> current_working_directory()
return Core::System::getcwd();
}
ErrorOr<String> absolute_path(StringView path)
ErrorOr<ByteString> absolute_path(StringView path)
{
if (exists(path))
return TRY(real_path(path));
return TRY(real_path(path)).to_byte_string();
if (path.starts_with("/"sv))
return TRY(String::from_byte_string(LexicalPath::canonicalized_path(path)));
return LexicalPath::canonicalized_path(path);
auto working_directory = TRY(current_working_directory());
auto full_path = LexicalPath::join(working_directory, path).string();
return TRY(String::from_byte_string(LexicalPath::canonicalized_path(full_path)));
return LexicalPath::absolute_path(working_directory, path);
}
ErrorOr<String> real_path(StringView path)