Use rename(2) wrapper

Bug: b/491555334

Author: Databean

base/cvd/cuttlefish/common/libs/utils/BUILD.bazel

@@ -104,6 +104,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:in_sandbox",
         "//cuttlefish/common/libs/utils:users",
+        "//cuttlefish/posix:rename",
         "//cuttlefish/posix:strerror",
         "//cuttlefish/posix:symlink",
         "//cuttlefish/result",

base/cvd/cuttlefish/common/libs/utils/files.cpp

@@ -68,6 +68,7 @@
 #include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/common/libs/utils/in_sandbox.h"
 #include "cuttlefish/common/libs/utils/users.h"
+#include "cuttlefish/posix/rename.h"
 #include "cuttlefish/posix/strerror.h"
 #include "cuttlefish/result/result.h"
 
@@ -187,9 +188,7 @@ Result<void> MoveDirectoryContents(const std::string& source,
     std::string src_filepath = source + "/" + filepath;
     std::string dst_filepath = destination + "/" + filepath;
     if (should_rename) {
-      CF_EXPECT(rename(src_filepath.c_str(), dst_filepath.c_str()) == 0,
-                "rename " << src_filepath << " to " << dst_filepath
-                          << " failed: " << strerror(errno));
+      CF_EXPECT(Rename(src_filepath, dst_filepath));
     } else {
       CF_EXPECT(
           Copy(src_filepath, dst_filepath),
@@ -490,9 +489,7 @@ Result<std::chrono::system_clock::time_point> FileModificationTime(
 Result<std::string> RenameFile(const std::string& current_filepath,
                                const std::string& target_filepath) {
   if (current_filepath != target_filepath) {
-    CF_EXPECT(rename(current_filepath.c_str(), target_filepath.c_str()) == 0,
-              "rename " << current_filepath << " to " << target_filepath
-                        << " failed: " << strerror(errno));
+    CF_EXPECT(Rename(current_filepath, target_filepath));
   }
   return target_filepath;
 }

base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel

@@ -79,9 +79,11 @@ cf_cc_library(
     hdrs = ["de_android_sparse.h"],
     deps = [
         "//cuttlefish/host/libs/image_aggregator:sparse_image",
+        "//cuttlefish/posix:rename",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
         "@android_system_core//:libsparse",
     ],
 )

base/cvd/cuttlefish/host/commands/cvd/fetch/de_android_sparse.cc

@@ -16,15 +16,16 @@
 #include "cuttlefish/host/commands/cvd/fetch/de_android_sparse.h"
 
 #include <cstddef>
-#include <iostream>
 #include <string>
 #include <vector>
 
-#include <android-base/file.h>
-#include <sparse/sparse.h>
+#include "absl/log/check.h"
 #include "absl/log/log.h"
+#include "android-base/file.h"
+#include "sparse/sparse.h"
 
 #include "cuttlefish/host/libs/image_aggregator/sparse_image.h"
+#include "cuttlefish/posix/rename.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
@@ -71,11 +72,8 @@ bool ConvertToRawImageNoBinary(const std::string& image_path) {
     PLOG(FATAL) << "Unable to delete original sparse image";
   }
 
-  int success = rename(tmp_raw_image_path.c_str(), image_path.c_str());
-  if (success != 0) {
-    LOG(FATAL) << "Unable to rename raw image " << success;
-    return false;
-  }
+  Result<void> result = Rename(tmp_raw_image_path, image_path.c_str());
+  CHECK(result.ok()) << "Unable to rename raw image: " << result.error();
 
   return true;
 }

base/cvd/cuttlefish/host/libs/directories/BUILD.bazel

@@ -17,6 +17,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:users",
+        "//cuttlefish/posix:rename",
         "//cuttlefish/posix:strerror",
         "//cuttlefish/result",
         "//libbase",

base/cvd/cuttlefish/host/libs/directories/xdg.cpp

@@ -27,10 +27,10 @@
 
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
-#include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/environment.h"
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/users.h"
+#include "cuttlefish/posix/rename.h"
 #include "cuttlefish/posix/strerror.h"
 #include "cuttlefish/result/result.h"
 
@@ -175,9 +175,7 @@ Result<void> WriteCvdDataFile(std::string_view path, std::string contents) {
   CF_EXPECT_EQ(WriteAll(file_fd, contents), contents.size(),
                file_fd->StrError());
 
-  CF_EXPECTF(rename(full_path_template.data(), full_path.data()) == 0,
-             "Failed to rename '{}' to '{}': '{}'", full_path_template,
-             full_path, StrError(errno));
+  CF_EXPECT(Rename(full_path_template, full_path));
 
   return {};
 }

base/cvd/cuttlefish/host/libs/image_aggregator/BUILD.bazel

@@ -132,7 +132,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:subprocess",
         "//cuttlefish/host/libs/config:known_paths",
         "//cuttlefish/host/libs/image_aggregator:disk_image",
-        "//cuttlefish/posix:strerror",
+        "//cuttlefish/posix:rename",
         "//cuttlefish/result",
         "//libbase",
         "@android_system_core//:libsparse",

base/cvd/cuttlefish/host/libs/image_aggregator/sparse_image.cc

@@ -29,7 +29,7 @@
 #include "cuttlefish/common/libs/fs/shared_fd.h"
 #include "cuttlefish/common/libs/utils/subprocess.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
-#include "cuttlefish/posix/strerror.h"
+#include "cuttlefish/posix/rename.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
@@ -91,9 +91,7 @@ Result<void> ForceRawImage(const std::string& image_path) {
   // `rename` can fail if these are on different mounts, but they are files
   // within the same directory so they can only be in different mounts if one
   // is a bind mount, in which case `rename` won't work anyway.
-  CF_EXPECTF(rename(tmp_raw_image_path.c_str(), image_path.c_str()) == 0,
-             "rename('{}','{}') failed: {}", tmp_raw_image_path, image_path,
-             StrError(errno));
+  CF_EXPECT(Rename(tmp_raw_image_path, image_path));
 
   return {};
 }

base/cvd/cuttlefish/posix/rename.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2025 The Android Open Source Project
+ * Copyright (C) 2026 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.