RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 09:57:36 +00:00
Code Issues Activity Actions

LibCore+Userland: Remove File::ensure_parent_directories

Browse source 
We have a much safer and more powerful alternative now, so let's move
the few users over.
This commit is contained in:
kleines Filmröllchen 2022-04-10 20:51:01 +02:00 • committed by Andreas Kling
parent 0fd09b2381
commit 5319e3a03f
7 changed files with 14 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Utilities/install.cpp
View file

@ -7,6 +7,7 @@
#include <AK/LexicalPath.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/Directory.h>
#include <LibCore/File.h>
#include <LibCore/FilePermissionsMask.h>
#include <LibCore/System.h>
@ -35,7 +36,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (create_leading_dest_components) {
String destination_dir_absolute = Core::File::absolute_path(destination_dir);
Core::File::ensure_directories(destination_dir_absolute);
MUST(Core::Directory::create(destination_dir_absolute, Core::Directory::CreateDirectories::Yes));
}
for (auto const& source : sources) {

8
Userland/Utilities/tar.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "LibCore/Directory.h"
#include <AK/Assertions.h>
#include <AK/LexicalPath.h>
#include <AK/Span.h>
@ -136,11 +137,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Archive::TarFileStream file_stream = tar_stream.file_contents();
String absolute_path = Core::File::absolute_path(filename);
auto parent_path = LexicalPath(absolute_path).parent();
switch (header.type_flag()) {
case Archive::TarFileType::NormalFile:
case Archive::TarFileType::AlternateNormalFile: {
Core::File::ensure_parent_directories(absolute_path);
MUST(Core::Directory::create(parent_path, Core::Directory::CreateDirectories::Yes));
int fd = TRY(Core::System::open(absolute_path, O_CREAT | O_WRONLY, header.mode()));
@ -153,13 +155,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
break;
}
case Archive::TarFileType::SymLink: {
Core::File::ensure_parent_directories(absolute_path);
MUST(Core::Directory::create(parent_path, Core::Directory::CreateDirectories::Yes));
TRY(Core::System::symlink(header.link_name(), absolute_path));
break;
}
case Archive::TarFileType::Directory: {
Core::File::ensure_parent_directories(absolute_path);
MUST(Core::Directory::create(parent_path, Core::Directory::CreateDirectories::Yes));
auto result_or_error = Core::System::mkdir(absolute_path, header.mode());
if (result_or_error.is_error() && result_or_error.error().code() != EEXIST)