Skip to content

Move RemoveFile out of utils:files #2985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Databean wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move RemoveFile out of utils:files #2985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/common/libs/utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ cf_cc_library(
"//cuttlefish/files:file_exists",
"//cuttlefish/files:link_or_copy",
"//cuttlefish/posix:realpath",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:rename",
"//cuttlefish/posix:strerror",
"//cuttlefish/result",
Expand Down
9 changes: 1 addition & 8 deletions base/cvd/cuttlefish/common/libs/utils/files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#include "cuttlefish/files/file_exists.h"
#include "cuttlefish/files/link_or_copy.h"
#include "cuttlefish/posix/realpath.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/rename.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/result/result.h"
Expand Down Expand Up @@ -268,14 +269,6 @@ Result<std::string> RenameFile(const std::string& current_filepath,
return target_filepath;
}

Result<void> RemoveFile(const std::string& file) {
VLOG(0) << "Removing file " << file;
if (remove(file.c_str()) != 0) {
return CF_ERRF("Failed to remove file '{}' : {}", file, StrError(errno));
}
return {};
}

std::string ReadFile(const std::string& file) {
std::string contents;
std::ifstream in(file, std::ios::in | std::ios::binary);
Expand Down
1 change: 0 additions & 1 deletion base/cvd/cuttlefish/common/libs/utils/files.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Result<void> ChangeGroup(const std::string& path,
bool CanAccess(const std::string& path, int mode);
Result<bool> IsDirectoryEmpty(const std::string& path);
off_t FileSize(const std::string& path);
Result<void> RemoveFile(const std::string& file);
Result<std::string> RenameFile(const std::string& current_filepath,
const std::string& target_filepath);
std::string ReadFile(const std::string& file);
Expand Down
3 changes: 3 additions & 0 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ cf_cc_binary(
"//cuttlefish/host/libs/feature",
"//cuttlefish/host/libs/feature:inject",
"//cuttlefish/host/libs/log_names",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:symlink",
"//cuttlefish/pretty:vector",
"//cuttlefish/result",
Expand Down Expand Up @@ -110,6 +111,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config:kernel_args",
"//cuttlefish/host/libs/config:mkenvimage_slim",
"//cuttlefish/host/libs/vm_manager",
"//cuttlefish/posix:remove",
"//cuttlefish/result",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/strings",
Expand Down Expand Up @@ -143,6 +145,7 @@ cf_cc_library(
"//cuttlefish/io:shared_fd",
"//cuttlefish/io:string",
"//cuttlefish/io:write_exact",
"//cuttlefish/posix:remove",
"//cuttlefish/process:command",
"//cuttlefish/process:execute",
"//cuttlefish/result",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
#include "cuttlefish/host/libs/feature/feature.h"
#include "cuttlefish/host/libs/feature/inject.h"
#include "cuttlefish/host/libs/log_names/log_names.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/symlink.h"
#include "cuttlefish/pretty/vector.h"
#include "cuttlefish/result/result.h"
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/boot_config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include "cuttlefish/host/libs/config/kernel_args.h"
#include "cuttlefish/host/libs/config/mkenvimage_slim.h"
#include "cuttlefish/host/libs/vm_manager/crosvm_manager.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/result/result.h"

using cuttlefish::vm_manager::CrosvmManager;
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include "cuttlefish/io/shared_fd.h"
#include "cuttlefish/io/string.h"
#include "cuttlefish/io/write_exact.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/process/execute.h"
#include "cuttlefish/result/result.h"
Expand Down
3 changes: 2 additions & 1 deletion base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ cf_cc_library(
hdrs = ["log_files.h"],
include_cleaner_enabled = False,
deps = [
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/files:directory_contents",
"//cuttlefish/files:directory_exists",
"//cuttlefish/host/commands/cvd/utils",
"//cuttlefish/posix:remove",
"//cuttlefish/result",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/strings",
Expand Down Expand Up @@ -171,6 +171,7 @@ cf_cc_library(
"//cuttlefish/host/commands/cvd/instances/lock",
"//cuttlefish/host/commands/cvd/utils",
"//cuttlefish/posix:realpath",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:strerror",
"//cuttlefish/posix:symlink",
"//cuttlefish/result",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/log_names",
"//cuttlefish/host/libs/metrics:device_metrics_orchestration",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:symlink",
"//cuttlefish/process:command",
"//cuttlefish/result",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/cli/commands/create.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#include "cuttlefish/host/commands/cvd/instances/local_instance_group.h"
#include "cuttlefish/host/commands/cvd/utils/common.h"
#include "cuttlefish/posix/realpath.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/posix/symlink.h"
#include "cuttlefish/result/result.h"
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/log_names/log_names.h"
#include "cuttlefish/host/libs/metrics/device_metrics_orchestration.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/symlink.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/result/result.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/cvd/cli/log_files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
#include "absl/log/log.h"
#include "absl/strings/match.h"

#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/files/directory_contents.h"
#include "cuttlefish/files/directory_exists.h"
#include "cuttlefish/host/commands/cvd/utils/common.h"
#include "cuttlefish/posix/remove.h"

namespace cuttlefish {
namespace {
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ cf_cc_library(
"//cuttlefish/host/libs/web:build_api_zip",
"//cuttlefish/host/libs/zip:zip_file",
"//cuttlefish/host/libs/zip/libzip_cc:archive",
"//cuttlefish/posix:remove",
"//cuttlefish/result",
"//libbase",
"@abseil-cpp//absl/strings",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/fetch/fetch_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "cuttlefish/host/libs/web/build_api_zip.h"
#include "cuttlefish/host/libs/zip/libzip_cc/archive.h"
#include "cuttlefish/host/libs/zip/zip_file.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/result/result.h"

namespace cuttlefish {
Expand Down
2 changes: 2 additions & 0 deletions base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/metrics:device_metrics_orchestration",
"//cuttlefish/host/libs/screen_recording_controls",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:symlink",
"//cuttlefish/process:command",
"//cuttlefish/process:managed_stdio",
Expand Down Expand Up @@ -246,6 +247,7 @@ cf_cc_library(
"//cuttlefish/host/commands/cvd/instances:run_cvd_proc_collector",
"//cuttlefish/host/commands/cvd/utils",
"//cuttlefish/host/libs/config:config_constants",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:strerror",
"//cuttlefish/process:command",
"//cuttlefish/process:managed_stdio",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "cuttlefish/host/commands/cvd/utils/common.h"
#include "cuttlefish/host/libs/config/config_utils.h"
#include "cuttlefish/host/libs/metrics/device_metrics_orchestration.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/symlink.h"
#include "cuttlefish/result/result.h"

Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/instances/lock/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cf_cc_library(
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/files:directory_exists",
"//cuttlefish/host/commands/cvd/utils:common",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:strerror",
"//cuttlefish/result",
"//libbase",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/instances/lock/instance_lock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <utility>

#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/result/result.h"

Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/cvd/instances/stop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "cuttlefish/host/commands/cvd/instances/run_cvd_proc_collector.h"
#include "cuttlefish/host/commands/cvd/utils/common.h"
#include "cuttlefish/host/libs/config/config_constants.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/process/managed_stdio.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/host_bugreport/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ cf_cc_binary(
include_cleaner_enabled = False,
deps = [
"//cuttlefish/common/libs/utils:environment",
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/common/libs/utils:tee_logging",
"//cuttlefish/files:directory_contents",
"//cuttlefish/files:directory_exists",
"//cuttlefish/files:file_exists",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/log_names",
"//cuttlefish/host/libs/zip:zip_file",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:strerror",
"//cuttlefish/process:command",
"//cuttlefish/result",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/host_bugreport/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "gflags/gflags.h"

#include "cuttlefish/common/libs/utils/environment.h"
#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/common/libs/utils/known_paths.h"
#include "cuttlefish/common/libs/utils/tee_logging.h"
#include "cuttlefish/files/directory_contents.h"
Expand All @@ -32,6 +31,7 @@
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/log_names/log_names.h"
#include "cuttlefish/host/libs/zip/zip_file.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/result/result.h"
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/run_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ cf_cc_library(
"//cuttlefish/host/libs/feature:inject",
"//cuttlefish/host/libs/process_monitor",
"//cuttlefish/host/libs/vm_manager",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:strerror",
"//cuttlefish/process:command",
"//cuttlefish/process:execute",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/run_cvd/server_loop_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include "cuttlefish/host/libs/config/vmm_mode.h"
#include "cuttlefish/host/libs/feature/command_source.h"
#include "cuttlefish/host/libs/process_monitor/process_monitor.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/result/result.h"
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/posix:readlink",
"//cuttlefish/posix:realpath",
"//cuttlefish/posix:remove",
"//cuttlefish/posix:strerror",
"//cuttlefish/posix:symlink",
"//cuttlefish/result",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/command_util/snapshot_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "cuttlefish/files/file_exists.h"
#include "cuttlefish/posix/readlink.h"
#include "cuttlefish/posix/realpath.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/posix/symlink.h"
#include "cuttlefish/result/result.h"

Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/config/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config:openwrt_args",
"//cuttlefish/host/libs/config/esp:make_fat_image",
"//cuttlefish/host/libs/image_aggregator:mbr",
"//cuttlefish/posix:remove",
"//cuttlefish/process:command",
"//cuttlefish/process:execute",
"//cuttlefish/process:managed_stdio",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/config/data_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "cuttlefish/host/libs/config/esp/make_fat_image.h"
#include "cuttlefish/host/libs/config/openwrt_args.h"
#include "cuttlefish/host/libs/image_aggregator/mbr.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/process/execute.h"
#include "cuttlefish/process/managed_stdio.h"
Expand Down
2 changes: 2 additions & 0 deletions base/cvd/cuttlefish/host/libs/web/cas/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cf_cc_library(
"//cuttlefish/files:file_exists",
"//cuttlefish/host/libs/web:android_build",
"//cuttlefish/host/libs/web/cas:cas_flags",
"//cuttlefish/posix:remove",
"//cuttlefish/process:command",
"//cuttlefish/process:managed_stdio",
"//cuttlefish/result",
Expand All @@ -34,6 +35,7 @@ cf_cc_test(
"//cuttlefish/host/libs/web:android_build",
"//cuttlefish/host/libs/web/cas:cas_downloader",
"//cuttlefish/host/libs/web/cas:cas_flags",
"//cuttlefish/posix:remove",
"//cuttlefish/result",
"//cuttlefish/result:result_matchers",
"//libbase",
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/web/cas/cas_downloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "cuttlefish/files/file_exists.h"
#include "cuttlefish/host/libs/web/android_build.h"
#include "cuttlefish/host/libs/web/cas/cas_flags.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/process/managed_stdio.h"
#include "cuttlefish/result/result.h"
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/web/cas/cas_downloader_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "cuttlefish/files/file_exists.h"
#include "cuttlefish/host/libs/web/android_build.h"
#include "cuttlefish/host/libs/web/cas/cas_flags.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/result/result.h"
#include "cuttlefish/result/result_matchers.h"

Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/web/http_client/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ cf_cc_library(
"//cuttlefish/common/libs/fs:shared_fd_stream",
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/libs/web/http_client",
"//cuttlefish/posix:remove",
"//cuttlefish/result",
"@abseil-cpp//absl/log",
],
Expand Down
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/libs/web/http_client/http_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "cuttlefish/common/libs/fs/shared_fd_stream.h"
#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/host/libs/web/http_client/http_client.h"
#include "cuttlefish/posix/remove.h"
#include "cuttlefish/result/result.h"

namespace cuttlefish {
Expand Down
12 changes: 12 additions & 0 deletions base/cvd/cuttlefish/posix/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,15 @@ cf_cc_library(
"//cuttlefish/result:result_type",
],
)

cf_cc_library(
name = "remove",
srcs = ["remove.cc"],
hdrs = ["remove.h"],
deps = [
"//cuttlefish/posix:strerror",
"//cuttlefish/result:expect",
"//cuttlefish/result:result_type",
"@abseil-cpp//absl/log",
],
)
40 changes: 40 additions & 0 deletions base/cvd/cuttlefish/posix/remove.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "cuttlefish/posix/remove.h"

#include <errno.h>
#include <stdio.h>

#include <string>

#include "absl/log/log.h"

#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/result/expect.h"
#include "cuttlefish/result/result_type.h"

namespace cuttlefish {

Result<void> RemoveFile(const std::string& file) {
VLOG(0) << "Removing file " << file;
if (remove(file.c_str()) != 0) {
return CF_ERRF("Failed to remove file '{}' : {}", file, StrError(errno));
}
return {};
}

} // namespace cuttlefish
Loading
Loading