drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reimplement ZipFileRO in terms of libziparchive.

Browse Source 
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

(cherry picked from commit afd31e0829)

Change-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191
This commit is contained in:
Narayan Kamath
2013-12-03 13:16:03 +00:00
committed by Adam Lesinski
parent e1aa223657
commit 560566d291
9 changed files with 322 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/androidfw/ZipUtils.h
View File

@ -21,6 +21,7 @@
#define __LIBS_ZIPUTILS_H
#include <stdio.h>
#include <time.h>
namespace android {
@ -33,9 +34,11 @@ public:
* General utility function for uncompressing "deflate" data from a file
* to a buffer.
*/
static bool inflateToBuffer(FILE* fp, void* buf, long uncompressedLen,
long compressedLen);
static bool inflateToBuffer(int fd, void* buf, long uncompressedLen,
long compressedLen);
static bool inflateToBuffer(FILE* fp, void* buf, long uncompressedLen,
static bool inflateToBuffer(void *in, void* buf, long uncompressedLen,
long compressedLen);
/*
@ -57,6 +60,19 @@ public:
static bool examineGzip(FILE* fp, int* pCompressionMethod,
long* pUncompressedLen, long* pCompressedLen, unsigned long* pCRC32);
/*
* Utility function to convert ZIP's time format to a timespec struct.
*/
static inline void zipTimeToTimespec(long when, struct tm* timespec) {
const long date = when >> 16;
timespec->tm_year = ((date >> 9) & 0x7F) + 80; // Zip is years since 1980
timespec->tm_mon = (date >> 5) & 0x0F;
timespec->tm_mday = date & 0x1F;
timespec->tm_hour = (when >> 11) & 0x1F;
timespec->tm_min = (when >> 5) & 0x3F;
timespec->tm_sec = (when & 0x1F) << 1;
}
private:
ZipUtils() {}
~ZipUtils() {}