diff options
| author | Tao Bao <tbao@google.com> | 2015-12-15 19:23:53 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-15 19:23:53 +0100 |
| commit | 125a6349b9b390bd531690099939aaaf8a7513a8 (patch) | |
| tree | ebcae32374c84258018e995b10224c0f0eb6a78e | |
| parent | Merge "update_verifier: Track the API change for isSlotBootable()." (diff) | |
| parent | Merge "updater: Use O_SYNC and fsync() for package_extract_file()." (diff) | |
| download | android_bootable_recovery-125a6349b9b390bd531690099939aaaf8a7513a8.tar android_bootable_recovery-125a6349b9b390bd531690099939aaaf8a7513a8.tar.gz android_bootable_recovery-125a6349b9b390bd531690099939aaaf8a7513a8.tar.bz2 android_bootable_recovery-125a6349b9b390bd531690099939aaaf8a7513a8.tar.lz android_bootable_recovery-125a6349b9b390bd531690099939aaaf8a7513a8.tar.xz android_bootable_recovery-125a6349b9b390bd531690099939aaaf8a7513a8.tar.zst android_bootable_recovery-125a6349b9b390bd531690099939aaaf8a7513a8.zip | |
| -rw-r--r-- | updater/install.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index e2b3db7ce..b09086964 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -555,14 +555,21 @@ Value* PackageExtractFileFn(const char* name, State* state, } { - FILE* f = fopen(dest_path, "wb"); - if (f == NULL) { - printf("%s: can't open %s for write: %s\n", - name, dest_path, strerror(errno)); + int fd = TEMP_FAILURE_RETRY(open(dest_path, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, + S_IRUSR | S_IWUSR)); + if (fd == -1) { + printf("%s: can't open %s for write: %s\n", name, dest_path, strerror(errno)); goto done2; } - success = mzExtractZipEntryToFile(za, entry, fileno(f)); - fclose(f); + success = mzExtractZipEntryToFile(za, entry, fd); + if (fsync(fd) == -1) { + printf("fsync of \"%s\" failed: %s\n", dest_path, strerror(errno)); + success = false; + } + if (close(fd) == -1) { + printf("close of \"%s\" failed: %s\n", dest_path, strerror(errno)); + success = false; + } } done2: |