summaryrefslogtreecommitdiffstats
path: root/otafault
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-09-09 05:10:11 +0200
committerTianjie Xu <xunchang@google.com>2016-10-18 02:41:51 +0200
commit8cf5c8f60f51049278b08ae4cbc31df397b651fd (patch)
treea49e8f62581f0fbc8f7e352ee780220130435a6f /otafault
parentMerge "Change StringValue to use std::string" (diff)
downloadandroid_bootable_recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar
android_bootable_recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar.gz
android_bootable_recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar.bz2
android_bootable_recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar.lz
android_bootable_recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar.xz
android_bootable_recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.tar.zst
android_bootable_recovery-8cf5c8f60f51049278b08ae4cbc31df397b651fd.zip
Diffstat (limited to '')
-rw-r--r--otafault/Android.mk2
-rw-r--r--otafault/config.cpp20
-rw-r--r--otafault/config.h4
3 files changed, 15 insertions, 11 deletions
diff --git a/otafault/Android.mk b/otafault/Android.mk
index 82c267101..71c2c62f6 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
otafault_static_libs := \
- libminzip \
+ libziparchive \
libz \
libselinux \
libbase \
diff --git a/otafault/config.cpp b/otafault/config.cpp
index b4567392d..ee4ef8911 100644
--- a/otafault/config.cpp
+++ b/otafault/config.cpp
@@ -21,21 +21,21 @@
#include <unistd.h>
#include <android-base/stringprintf.h>
+#include <ziparchive/zip_archive.h>
-#include "minzip/Zip.h"
#include "config.h"
#include "ota_io.h"
#define OTAIO_MAX_FNAME_SIZE 128
-static ZipArchive* archive;
+static ZipArchiveHandle archive;
static std::map<std::string, bool> should_inject_cache;
static std::string get_type_path(const char* io_type) {
return android::base::StringPrintf("%s/%s", OTAIO_BASE_DIR, io_type);
}
-void ota_io_init(ZipArchive* za) {
+void ota_io_init(ZipArchiveHandle za) {
archive = za;
ota_set_fault_files();
}
@@ -50,9 +50,11 @@ bool should_fault_inject(const char* io_type) {
if (should_inject_cache.find(type_path) != should_inject_cache.end()) {
return should_inject_cache[type_path];
}
- const ZipEntry* entry = mzFindZipEntry(archive, type_path.c_str());
- should_inject_cache[type_path] = entry != nullptr;
- return entry != NULL;
+ ZipString zip_type_path(type_path.c_str());
+ ZipEntry entry;
+ int status = FindEntry(archive, zip_type_path, &entry);
+ should_inject_cache[type_path] = (status == 0);
+ return (status == 0);
}
bool should_hit_cache() {
@@ -63,7 +65,9 @@ std::string fault_fname(const char* io_type) {
std::string type_path = get_type_path(io_type);
std::string fname;
fname.resize(OTAIO_MAX_FNAME_SIZE);
- const ZipEntry* entry = mzFindZipEntry(archive, type_path.c_str());
- mzReadZipEntry(archive, entry, &fname[0], OTAIO_MAX_FNAME_SIZE);
+ ZipString zip_type_path(type_path.c_str());
+ ZipEntry entry;
+ int status = FindEntry(archive, zip_type_path, &entry);
+ ExtractToMemory(archive, &entry, reinterpret_cast<uint8_t*>(&fname[0]), OTAIO_MAX_FNAME_SIZE);
return fname;
}
diff --git a/otafault/config.h b/otafault/config.h
index 4430be3fb..c048617c2 100644
--- a/otafault/config.h
+++ b/otafault/config.h
@@ -41,7 +41,7 @@
#include <stdbool.h>
-#include "minzip/Zip.h"
+#include <ziparchive/zip_archive.h>
#define OTAIO_BASE_DIR ".libotafault"
#define OTAIO_READ "READ"
@@ -52,7 +52,7 @@
/*
* Initialize libotafault by providing a reference to the OTA package.
*/
-void ota_io_init(ZipArchive* za);
+void ota_io_init(ZipArchiveHandle zip);
/*
* Return true if a config file is present for the given IO type.