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

2 files changed, 2 insertions, 7 deletions

diff --git a/Userland/Libraries/LibCore/MappedFile.cpp b/Userland/Libraries/LibCore/MappedFile.cpp
index 1fc28c7530..627b7d1a39 100644
--- a/Userland/Libraries/LibCore/MappedFile.cpp
+++ b/Userland/Libraries/LibCore/MappedFile.cpp
@@ -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);
 }
 
diff --git a/Userland/Libraries/LibCore/System.cpp b/Userland/Libraries/LibCore/System.cpp
index 37e1099b66..c1a66dac17 100644
--- a/Userland/Libraries/LibCore/System.cpp
+++ b/Userland/Libraries/LibCore/System.cpp
@@ -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);