diff options
author | Tianjie Xu <xunchang@google.com> | 2017-11-06 20:02:01 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-06 20:02:01 +0100 |
commit | c1ab2bb5354354ad13da37dd2b664d861d9e2111 (patch) | |
tree | e5b3cb24be5eff1e6796814b3a023160a42acd97 /applypatch/applypatch.cpp | |
parent | Merge "Clean up fuse_sideload and add a testcase." (diff) | |
parent | Merge "Switch to bionic gtest in bootable/recovery" (diff) | |
download | android_bootable_recovery-c1ab2bb5354354ad13da37dd2b664d861d9e2111.tar android_bootable_recovery-c1ab2bb5354354ad13da37dd2b664d861d9e2111.tar.gz android_bootable_recovery-c1ab2bb5354354ad13da37dd2b664d861d9e2111.tar.bz2 android_bootable_recovery-c1ab2bb5354354ad13da37dd2b664d861d9e2111.tar.lz android_bootable_recovery-c1ab2bb5354354ad13da37dd2b664d861d9e2111.tar.xz android_bootable_recovery-c1ab2bb5354354ad13da37dd2b664d861d9e2111.tar.zst android_bootable_recovery-c1ab2bb5354354ad13da37dd2b664d861d9e2111.zip |
Diffstat (limited to '')
-rw-r--r-- | applypatch/applypatch.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index c8b75df79..2153b5f19 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -42,6 +42,8 @@ #include "otafault/ota_io.h" #include "otautil/print_sha1.h" +std::string cache_temp_source = "/cache/saved.file"; + static int LoadPartitionContents(const std::string& filename, FileContents* file); static size_t FileSink(const unsigned char* data, size_t len, int fd); static int GenerateTarget(const FileContents& source_file, const std::unique_ptr<Value>& patch, @@ -411,12 +413,10 @@ int applypatch_check(const char* filename, const std::vector<std::string>& patch (!patch_sha1_str.empty() && FindMatchingPatch(file.sha1, patch_sha1_str) < 0)) { printf("file \"%s\" doesn't have any of expected sha1 sums; checking cache\n", filename); - // If the source file is missing or corrupted, it might be because - // we were killed in the middle of patching it. A copy of it - // should have been made in CACHE_TEMP_SOURCE. If that file - // exists and matches the sha1 we're looking for, the check still - // passes. - if (LoadFileContents(CACHE_TEMP_SOURCE, &file) != 0) { + // If the source file is missing or corrupted, it might be because we were killed in the middle + // of patching it. A copy of it should have been made in cache_temp_source. If that file + // exists and matches the sha1 we're looking for, the check still passes. + if (LoadFileContents(cache_temp_source.c_str(), &file) != 0) { printf("failed to load cache file\n"); return 1; } @@ -539,7 +539,7 @@ int applypatch(const char* source_filename, const char* target_filename, printf("source file is bad; trying copy\n"); FileContents copy_file; - if (LoadFileContents(CACHE_TEMP_SOURCE, ©_file) < 0) { + if (LoadFileContents(cache_temp_source.c_str(), ©_file) < 0) { printf("failed to read copy file\n"); return 1; } @@ -634,7 +634,7 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr printf("not enough free space on /cache\n"); return 1; } - if (SaveFileContents(CACHE_TEMP_SOURCE, &source_file) < 0) { + if (SaveFileContents(cache_temp_source.c_str(), &source_file) < 0) { printf("failed to back up source file\n"); return 1; } @@ -680,7 +680,7 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr } // Delete the backup copy of the source. - unlink(CACHE_TEMP_SOURCE); + unlink(cache_temp_source.c_str()); // Success! return 0; |