diff options
| author | Samuel Huang <huangs@chromium.org> | 2018-03-21 18:54:03 +0000 |
|---|---|---|
| committer | Edward Lesmes <ehmaldonado@google.com> | 2021-07-23 21:58:36 +0000 |
| commit | 1bb3b651b14c9cec5cf0104a1dec1550b9c22983 (patch) | |
| tree | 6c50b80ae3ef0e87d09a70a233e9c37f3e0ff4e1 /zucchini_integration.cc | |
| parent | 6d057299c73d1c69ddd3084eb7cd1d25d8c70002 (diff) | |
| download | zucchini-1bb3b651b14c9cec5cf0104a1dec1550b9c22983.tar.gz | |
[Zucchini] Add "-keep" flag; remove redundnat CRC32 check.
By defaulti, Zucchini deletes the output (patch or patched "new") file
upon failure. The "-keep" debug flag overrides this behavior, so the
bad output file can be examined. This CL adds the flag for Zucchini-gen
and Zucchini-apply.
This CL also removes a duplicated call to Ensemble::CheckOldFile(),
which checks the CRC32 of the "old" file. This removal prevents
redundant work and slightly speed up Zucchini-apply (by ~5%).
Bug: 729154
Change-Id: I9ba8e9b00b7783661de06b39fae010761bedc6e6
Reviewed-on: https://chromium-review.googlesource.com/973746
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544786}
NOKEYCHECK=True
GitOrigin-RevId: 21879c3adbfbbf676e5ee28b9f0a19e60d104d80
Diffstat (limited to 'zucchini_integration.cc')
| -rw-r--r-- | zucchini_integration.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/zucchini_integration.cc b/zucchini_integration.cc index 2d78fdd..1149658 100644 --- a/zucchini_integration.cc +++ b/zucchini_integration.cc @@ -42,7 +42,8 @@ struct FileNames { status::Code ApplyCommon(base::File&& old_file_handle, base::File&& patch_file_handle, base::File&& new_file_handle, - const FileNames& names) { + const FileNames& names, + bool force_keep) { MappedFileReader patch_file(std::move(patch_file_handle)); if (patch_file.HasError()) { LOG(ERROR) << "Error with file " << names.patch_name.value() << ": " @@ -63,10 +64,6 @@ status::Code ApplyCommon(base::File&& old_file_handle, << old_file.error(); return status::kStatusFileReadError; } - if (!patch_reader->CheckOldFile(old_file.region())) { - LOG(ERROR) << "Invalid old_file."; - return status::kStatusInvalidOldImage; - } zucchini::PatchHeader header = patch_reader->header(); // By default, delete output on destruction, to avoid having lingering files @@ -83,6 +80,9 @@ status::Code ApplyCommon(base::File&& old_file_handle, return status::kStatusFileWriteError; } + if (force_keep) + new_file.Keep(); + zucchini::status::Code result = zucchini::Apply(old_file.region(), *patch_reader, new_file.region()); if (result != status::kStatusSuccess) { @@ -100,15 +100,17 @@ status::Code ApplyCommon(base::File&& old_file_handle, status::Code Apply(base::File&& old_file_handle, base::File&& patch_file_handle, - base::File&& new_file_handle) { + base::File&& new_file_handle, + bool force_keep) { const FileNames file_names; return ApplyCommon(std::move(old_file_handle), std::move(patch_file_handle), - std::move(new_file_handle), file_names); + std::move(new_file_handle), file_names, force_keep); } status::Code Apply(const base::FilePath& old_path, const base::FilePath& patch_path, - const base::FilePath& new_path) { + const base::FilePath& new_path, + bool force_keep) { using base::File; File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ); File patch_file(patch_path, File::FLAG_OPEN | File::FLAG_READ); @@ -117,7 +119,7 @@ status::Code Apply(const base::FilePath& old_path, File::FLAG_CAN_DELETE_ON_CLOSE); const FileNames file_names(old_path, patch_path, new_path); return ApplyCommon(std::move(old_file), std::move(patch_file), - std::move(new_file), file_names); + std::move(new_file), file_names, force_keep); } } // namespace zucchini |