diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:12:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:12:31 +0000 |
| commit | 13c6a4712a911dc3e8c91398cd94af035c16c42d (patch) | |
| tree | 3b2f451c095dda0f9783e6ec0c7a3f502b4224be /google/zip.cc | |
| parent | 96127c99b09ff102fab70f95541d9d433ce10ab8 (diff) | |
| parent | fdb5887e567ea43ed5eec533eb2d8100a8d6a6ab (diff) | |
| download | zlib-aml_sch_341510000.tar.gz | |
Snap for 10453563 from fdb5887e567ea43ed5eec533eb2d8100a8d6a6ab to mainline-scheduling-releaseaml_sch_341510000
Change-Id: Id50a2ef6028cdd799f5a95536d8bb18a9a3779f2
Diffstat (limited to 'google/zip.cc')
| -rw-r--r-- | google/zip.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/google/zip.cc b/google/zip.cc index 1a43196..490dcee 100644 --- a/google/zip.cc +++ b/google/zip.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -229,7 +229,10 @@ bool Unzip(const base::PlatformFile& src_file, // It's a file. std::unique_ptr<WriterDelegate> writer = writer_factory.Run(entry->path); - if (!writer || !reader.ExtractCurrentEntry(writer.get())) { + if (!writer || + (options.progress ? !reader.ExtractCurrentEntryWithListener( + writer.get(), options.progress) + : !reader.ExtractCurrentEntry(writer.get()))) { LOG(ERROR) << "Cannot extract file " << Redact(entry->path) << " from ZIP"; if (!options.continue_on_error) |