commit 064d03bea32ba078042c892f1b0a74bfe85f90c9
author Alessio Balsini <balsini@google.com> Wed Oct 16 04:07:11 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 16 04:07:11 2019 -0700
tree 3a24c06ff5f2e1432a73b26073de77cc475d48cc
parent 6d3a644a8fdfcfeba9903291fab03ae235d10178
parent 046a5126227566c37186052d1ad39aa18fd56d53

Merge "Use ReadFileToString() in GetHash()" am: 9b9854a80a
am: 32acbcc687

Change-Id: I362b1710fa9494fd2a8aa56ebdfcdd62204111f5

fs_mgr/libsnapshot/test_helpers.cpp

diff --git a/fs_mgr/libsnapshot/test_helpers.cpp b/fs_mgr/libsnapshot/test_helpers.cpp
index 1a6a593..539c5c5 100644
--- a/fs_mgr/libsnapshot/test_helpers.cpp
+++ b/fs_mgr/libsnapshot/test_helpers.cpp
@@ -92,21 +92,14 @@
 }
 
 std::optional<std::string> GetHash(const std::string& path) {
-    unique_fd fd(open(path.c_str(), O_RDONLY));
-    char buf[4096];
+    std::string content;
+    if (!android::base::ReadFileToString(path, &content, true)) {
+        PLOG(ERROR) << "Cannot access " << path;
+        return std::nullopt;
+    }
     SHA256_CTX ctx;
     SHA256_Init(&ctx);
-    while (true) {
-        ssize_t n = TEMP_FAILURE_RETRY(read(fd.get(), buf, sizeof(buf)));
-        if (n < 0) {
-            PLOG(ERROR) << "Cannot read " << path;
-            return std::nullopt;
-        }
-        if (n == 0) {
-            break;
-        }
-        SHA256_Update(&ctx, buf, n);
-    }
+    SHA256_Update(&ctx, content.c_str(), content.size());
     uint8_t out[32];
     SHA256_Final(out, &ctx);
     return ToHexString(out, sizeof(out));