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

LibCore: Rename File to DeprecatedFile

Browse source 
As usual, this removes many unused includes and moves used includes
further down the chain.
This commit is contained in:
Tim Schumacher 2023-02-08 21:08:01 +01:00 • committed by Linus Groh
parent 14951b92ca
commit d43a7eae54
193 changed files with 536 additions and 556 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Utilities/cp.cpp
View file

@ -6,7 +6,7 @@
#include <AK/LexicalPath.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <stdio.h>
@ -17,7 +17,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio rpath wpath cpath fattr chown"));
bool link = false;
auto preserve = Core::File::PreserveMode::Nothing;
auto preserve = Core::DeprecatedFile::PreserveMode::Nothing;
bool recursion_allowed = false;
bool verbose = false;
Vector<StringView> sources;
@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
"attributes",
[&preserve](char const* s) {
if (!s) {
preserve = Core::File::PreserveMode::Permissions | Core::File::PreserveMode::Ownership | Core::File::PreserveMode::Timestamps;
preserve = Core::DeprecatedFile::PreserveMode::Permissions | Core::DeprecatedFile::PreserveMode::Ownership | Core::DeprecatedFile::PreserveMode::Timestamps;
return true;
}
@ -41,11 +41,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
StringView { s, strlen(s) }.for_each_split_view(',', SplitBehavior::Nothing, [&](StringView value) {
if (value == "mode"sv) {
preserve |= Core::File::PreserveMode::Permissions;
preserve |= Core::DeprecatedFile::PreserveMode::Permissions;
} else if (value == "ownership"sv) {
preserve |= Core::File::PreserveMode::Ownership;
preserve |= Core::DeprecatedFile::PreserveMode::Ownership;
} else if (value == "timestamps"sv) {
preserve |= Core::File::PreserveMode::Timestamps;
preserve |= Core::DeprecatedFile::PreserveMode::Timestamps;
} else {
warnln("cp: Unknown or unimplemented --preserve attribute: '{}'", value);
values_ok = false;
@ -63,24 +63,24 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_positional_argument(destination, "Destination file path", "destination");
args_parser.parse(arguments);
if (has_flag(preserve, Core::File::PreserveMode::Permissions)) {
if (has_flag(preserve, Core::DeprecatedFile::PreserveMode::Permissions)) {
umask(0);
} else {
TRY(Core::System::pledge("stdio rpath wpath cpath fattr"));
}
bool destination_is_existing_dir = Core::File::is_directory(destination);
bool destination_is_existing_dir = Core::DeprecatedFile::is_directory(destination);
for (auto& source : sources) {
auto destination_path = destination_is_existing_dir
? DeprecatedString::formatted("{}/{}", destination, LexicalPath::basename(source))
: destination;
auto result = Core::File::copy_file_or_directory(
auto result = Core::DeprecatedFile::copy_file_or_directory(
destination_path, source,
recursion_allowed ? Core::File::RecursionMode::Allowed : Core::File::RecursionMode::Disallowed,
link ? Core::File::LinkMode::Allowed : Core::File::LinkMode::Disallowed,
Core::File::AddDuplicateFileMarker::No,
recursion_allowed ? Core::DeprecatedFile::RecursionMode::Allowed : Core::DeprecatedFile::RecursionMode::Disallowed,
link ? Core::DeprecatedFile::LinkMode::Allowed : Core::DeprecatedFile::LinkMode::Disallowed,
Core::DeprecatedFile::AddDuplicateFileMarker::No,
preserve);
if (result.is_error()) {