[skip ci] Merge "Handle errors from WalkDirectory" into main

GitOrigin-RevId: 4a9b51c

Author: adelva1984

staging/common/libs/utils/files.cpp

@@ -577,15 +577,19 @@ std::string FindImage(const std::string& search_path,
  return "";
 }
 
-std::string FindFile(const std::string& path, const std::string& target_name) {
+Result<std::string> FindFile(const std::string& path,
+ const std::string& target_name) {
  std::string ret;
- WalkDirectory(path,
- [&ret, &target_name](const std::string& filename) mutable {
- if (android::base::Basename(filename) == target_name) {
- ret = filename;
- }
- return true;
- });
+ auto res = WalkDirectory(
+ path, [&ret, &target_name](const std::string& filename) mutable {
+ if (android::base::Basename(filename) == target_name) {
+ ret = filename;
+ }
+ return true;
+ });
+ if (!res.ok()) {
+ return "";
+ }
  return ret;
 }
 
@@ -600,7 +604,10 @@ Result<void> WalkDirectory(
  file_path.append(filename);
  callback(file_path);
  if (DirectoryExists(file_path)) {
- WalkDirectory(file_path, callback);
+ auto res = WalkDirectory(file_path, callback);
+ if (!res.ok()) {
+ return res;
+ }
  }
  }
  return {};

staging/common/libs/utils/files.h

@@ -83,7 +83,8 @@ FileSizes SparseFileSizes(const std::string& path);
 
 // Find file with name |target_name| under directory |path|, return path to
 // found file(if any)
-std::string FindFile(const std::string& path, const std::string& target_name);
+Result<std::string> FindFile(const std::string& path,
+ const std::string& target_name);
 
 Result<void> WalkDirectory(
  const std::string& dir,

staging/host/commands/assemble_cvd/vendor_dlkm_utils.cc

@@ -74,8 +74,8 @@ bool WriteLinesToFile(const Container& lines, const char* path) {
 }
 
 // Generate a filesystem_config.txt for all files in |fs_root|
-bool WriteFsConfig(const char* output_path, const std::string& fs_root,
- const std::string& mount_point) {
+Result<bool> WriteFsConfig(const char* output_path, const std::string& fs_root,
+  const std::string& mount_point) {
  android::base::unique_fd fd(
  open(output_path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644));
  if (!fd.ok()) {
@@ -87,8 +87,8 @@ bool WriteFsConfig(const char* output_path, const std::string& fs_root,
  PLOG(ERROR) << "Failed to write to " << output_path;
  return false;
  }
- WalkDirectory(fs_root, [&fd, &output_path, &mount_point,
- &fs_root](const std::string& file_path) {
+ auto res = WalkDirectory(fs_root, [&fd, &output_path, &mount_point,
+  &fs_root](const std::string& file_path) {
  const auto filename = file_path.substr(
  fs_root.back() == '/' ? fs_root.size() : fs_root.size() + 1);
  std::string fs_context = " 0 0 644 capabilities=0x0\n";
@@ -102,6 +102,9 @@ bool WriteFsConfig(const char* output_path, const std::string& fs_root,
  }
  return true;
  });
+ if (!res.ok()) {
+ return false;
+ }
  return true;
 }
 
@@ -427,8 +430,13 @@ bool SplitRamdiskModules(const std::string& ramdisk_path,
  CHECK(ret.ok()) << ret.error().FormatForEnv();
  ret = EnsureDirectoryExists(system_modules_dir);
  UnpackRamdisk(ramdisk_path, ramdisk_stage_dir);
- const auto module_load_file =
- android::base::Trim(FindFile(ramdisk_stage_dir.c_str(), "modules.load"));
+ auto res = FindFile(ramdisk_stage_dir.c_str(), "modules.load");
+ if (!res) {
+ LOG(ERROR) << "Failed to find modules.dep file in input ramdisk "
+ << ramdisk_path;
+ return false;
+ }
+ const auto module_load_file = android::base::Trim(res.value());
  if (module_load_file.empty()) {
  LOG(ERROR) << "Failed to find modules.dep file in input ramdisk "
  << ramdisk_path;

staging/host/commands/assemble_cvd/vendor_dlkm_utils.h

@@ -26,8 +26,8 @@ bool SplitRamdiskModules(const std::string& ramdisk_path,
  const std::string& vendor_dlkm_build_dir,
  const std::string& system_dlkm_build_dir);
 
-bool WriteFsConfig(const char* output_path, const std::string& fs_root,
- const std::string& mount_point);
+Result<bool> WriteFsConfig(const char* output_path, const std::string& fs_root,
+  const std::string& mount_point);
 
 Result<void> RepackSuperWithPartition(const std::string& superimg_path,
  const std::string& image_path,