beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibCore: Add an optional permissions mask to Directory::create()

Browse source 
Being able to pass a mask is the one feature `mkdir()` had that this
didn't. Adding it here means everyone can use the nicer Directory API.
This commit is contained in:
Sam Atkins 2022-04-13 11:53:46 +01:00 committed by Andreas Kling
parent 6967d37678
commit 72893b4f9e
Notes: sideshowbarker 2024-07-17 11:50:47 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/72893b4f9e
Pull-request: https://github.com/SerenityOS/serenity/pull/13651
Reviewed-by: https://github.com/kleinesfilmroellchen
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibCore/Directory.cpp
View file

@ -45,28 +45,28 @@ ErrorOr<Directory> Directory::adopt_fd(int fd, Optional<LexicalPath> path)
return Directory { fd, move(path) };
}
ErrorOr<Directory> Directory::create(String path, CreateDirectories create_directories)
ErrorOr<Directory> Directory::create(String path, CreateDirectories create_directories, mode_t creation_mode)
{
return create(LexicalPath { move(path) }, create_directories);
return create(LexicalPath { move(path) }, create_directories, creation_mode);
}
ErrorOr<Directory> Directory::create(LexicalPath path, CreateDirectories create_directories)
ErrorOr<Directory> Directory::create(LexicalPath path, CreateDirectories create_directories, mode_t creation_mode)
{
if (create_directories == CreateDirectories::Yes)
TRY(ensure_directory(path));
TRY(ensure_directory(path, creation_mode));
// FIXME: doesn't work on Linux probably
auto fd = TRY(System::open(path.string(), O_CLOEXEC));
return adopt_fd(fd, move(path));
}
ErrorOr<void> Directory::ensure_directory(LexicalPath const& path)
ErrorOr<void> Directory::ensure_directory(LexicalPath const& path, mode_t creation_mode)
{
if (path.basename() == "/" || path.basename() == ".")
return {};
TRY(ensure_directory(path.parent()));
TRY(ensure_directory(path.parent(), creation_mode));
auto return_value = System::mkdir(path.string(), 0755);
auto return_value = System::mkdir(path.string(), creation_mode);
// We don't care if the directory already exists.
if (return_value.is_error() && return_value.error().code() != EEXIST)
return return_value;

6
Userland/Libraries/LibCore/Directory.h
View file

@ -33,8 +33,8 @@ public:
Yes,
};
static ErrorOr<Directory> create(LexicalPath path, CreateDirectories);
static ErrorOr<Directory> create(String path, CreateDirectories);
static ErrorOr<Directory> create(LexicalPath path, CreateDirectories, mode_t creation_mode = 0755);
static ErrorOr<Directory> create(String path, CreateDirectories, mode_t creation_mode = 0755);
static ErrorOr<Directory> adopt_fd(int fd, Optional<LexicalPath> path = {});
ErrorOr<NonnullOwnPtr<Stream::File>> open(StringView filename, Stream::OpenMode mode) const;
@ -47,7 +47,7 @@ public:
private:
Directory(int directory_fd, Optional<LexicalPath> path);
static ErrorOr<void> ensure_directory(LexicalPath const& path);
static ErrorOr<void> ensure_directory(LexicalPath const& path, mode_t creation_mode = 0755);
Optional<LexicalPath> m_path;
int m_directory_fd;