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

LibCore: Use open() wrapper in Core::MappedFile :^)

Browse source
This commit is contained in:
Andreas Kling 2021-11-23 11:59:54 +01:00
parent 50416c286d
commit 0ed5f84bd9
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibCore/MappedFile.cpp
View file

@ -8,20 +8,15 @@
#include <AK/String.h>
#include <LibCore/MappedFile.h>
#include <LibCore/System.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
namespace Core {
ErrorOr<NonnullRefPtr<MappedFile>> MappedFile::map(String const& path)
{
int fd = open(path.characters(), O_RDONLY | O_CLOEXEC, 0);
if (fd < 0)
return Error::from_errno(errno);
auto fd = TRY(Core::System::open(path, O_RDONLY | O_CLOEXEC, 0));
return map_from_fd_and_close(fd, path);
}

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

@ -107,7 +107,7 @@ ErrorOr<int> open(StringView path, int options, ...)
HANDLE_SYSCALL_RETURN_VALUE("open"sv, rc, rc);
#else
// NOTE: We have to ensure that the path is null-terminated.
String path_string;
String path_string = path;
int rc = ::open(path_string.characters(), options, mode);
if (rc < 0)
return Error::from_syscall("open"sv, -errno);