1 files changed, 90 insertions, 16 deletions

diff --git a/minzip/Zip.c b/minzip/Zip.c
index 40712e0..7823c38 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -5,6 +5,7 @@
  */
 #include "safe_iop.h"
 #include "zlib.h"
+#include "xz_config.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -198,10 +199,10 @@ static bool parseZipArchive(ZipArchive* pArchive)
      */
     val = get4LE(pArchive->addr);
     if (val == ENDSIG) {
-        LOGI("Found Zip archive, but it looks empty\n");
+        LOGW("Found Zip archive, but it looks empty\n");
         goto bail;
     } else if (val != LOCSIG) {
-        LOGV("Not a Zip archive (found 0x%08x)\n", val);
+        LOGW("Not a Zip archive (found 0x%08x)\n", val);
         goto bail;
     }
 
@@ -217,7 +218,7 @@ static bool parseZipArchive(ZipArchive* pArchive)
         ptr--;
     }
     if (ptr < (const unsigned char*) pArchive->addr) {
-        LOGI("Could not find end-of-central-directory in Zip\n");
+        LOGW("Could not find end-of-central-directory in Zip\n");
         goto bail;
     }
 
@@ -429,7 +430,7 @@ int mzOpenZipArchive(unsigned char* addr, size_t length, ZipArchive* pArchive)
 
     if (length < ENDHDR) {
         err = -1;
-        LOGV("File '%s' too small to be zip (%zd)\n", fileName, map.length);
+        LOGW("Archive %p is too small to be zip (%zd)\n", pArchive, length);
         goto bail;
     }
 
@@ -438,7 +439,7 @@ int mzOpenZipArchive(unsigned char* addr, size_t length, ZipArchive* pArchive)
 
     if (!parseZipArchive(pArchive)) {
         err = -1;
-        LOGV("Parsing '%s' failed\n", fileName);
+        LOGW("Parsing archive %p failed\n", pArchive);
         goto bail;
     }
 
@@ -501,12 +502,73 @@ static bool processStoredEntry(const ZipArchive *pArchive,
     return processFunction(pArchive->addr + pEntry->offset, pEntry->uncompLen, cookie);
 }
 
+static bool processXZEntry(const ZipArchive *pArchive,
+    const ZipEntry *pEntry, ProcessZipEntryContentsFunction processFunction,
+    void *cookie)
+{
+    unsigned char out[32*1024];
+    struct xz_buf b;
+    struct xz_dec *s;
+    enum xz_ret ret;
+
+    printf("ok!\n");
+    xz_crc32_init();
+    xz_crc64_init();
+    s = xz_dec_init(XZ_DYNALLOC, 1 << 26);
+    if (s == NULL) {
+        LOGE("XZ decompression alloc failed\n");
+        goto bail;
+    }
+
+    b.in = pArchive->addr + pEntry->offset;
+    b.in_pos = 0;
+    b.in_size = pEntry->compLen;
+    b.out = out;
+    b.out_pos = 0;
+    b.out_size = sizeof(out);
+
+    do {
+        ret = xz_dec_run(s, &b);
+
+        LOGVV("+++ b.in_pos = %zu b.out_pos = %zu ret=%d\n", b.in_pos, b.out_pos, ret);
+        if (b.out_pos == sizeof(out)) {
+            LOGVV("+++ processing %d bytes\n", b.out_pos);
+            bool err = processFunction(out, b.out_pos, cookie);
+            if (!err) {
+                LOGW("Process function elected to fail (in xz_dec)\n");
+                goto xz_bail;
+            }
+            b.out_pos = 0;
+        }
+
+    } while (ret == XZ_OK);
+
+    assert(ret == XZ_STREAM_END);
+
+    bool err = processFunction(out, b.out_pos, cookie);
+    if (!err) {
+        LOGW("Process function elected to fail (in xz_dec)\n");
+        goto xz_bail;
+    }
+
+
+xz_bail:
+    xz_dec_end(s);
+
+bail:
+    if (b.in_pos != (unsigned long)pEntry->compLen) {
+        LOGW("Size mismatch on file after xz_dec (%ld vs %zu)\n",
+                pEntry->compLen, b.in_pos);
+        //return false;
+    }
+    return true;
+}
+
 static bool processDeflatedEntry(const ZipArchive *pArchive,
     const ZipEntry *pEntry, ProcessZipEntryContentsFunction processFunction,
     void *cookie)
 {
     long result = -1;
-    unsigned char readBuf[32 * 1024];
     unsigned char procBuf[32 * 1024];
     z_stream zstream;
     int zerr;
@@ -549,7 +611,7 @@ static bool processDeflatedEntry(const ZipArchive *pArchive,
         /* uncompress the data */
         zerr = inflate(&zstream, Z_NO_FLUSH);
         if (zerr != Z_OK && zerr != Z_STREAM_END) {
-            LOGD("zlib inflate call failed (zerr=%d)\n", zerr);
+            LOGW("zlib inflate call failed (zerr=%d)\n", zerr);
             goto z_bail;
         }
 
@@ -603,7 +665,6 @@ bool mzProcessZipEntryContents(const ZipArchive *pArchive,
     void *cookie)
 {
     bool ret = false;
-    off_t oldOff;
 
     switch (pEntry->compression) {
     case STORED:
@@ -621,13 +682,6 @@ bool mzProcessZipEntryContents(const ZipArchive *pArchive,
     return ret;
 }
 
-static bool crcProcessFunction(const unsigned char *data, int dataLen,
-        void *crc)
-{
-    *(unsigned long *)crc = crc32(*(unsigned long *)crc, data, dataLen);
-    return true;
-}
-
 typedef struct {
     char *buf;
     int bufLen;
@@ -647,6 +701,26 @@ static bool copyProcessFunction(const unsigned char *data, int dataLen,
 }
 
 /*
+ * Similar to mzProcessZipEntryContents, but explicitly process the stream
+ * using XZ/LZMA before calling processFunction.
+ *
+ * This is a separate function for use by the updater. LZMA provides huge
+ * size reductions vs deflate, but isn't actually supported by the ZIP format.
+ * We need to process it using as little memory as possible.
+ */
+bool mzProcessZipEntryContentsXZ(const ZipArchive *pArchive,
+    const ZipEntry *pEntry, ProcessZipEntryContentsFunction processFunction,
+    void *cookie)
+{
+    if (pEntry->compression == STORED) {
+        return processXZEntry(pArchive, pEntry, processFunction, cookie);
+    }
+    LOGE("Explicit XZ decoding of entry '%s' unsupported for type %d",
+            pEntry->fileName, pEntry->compression);
+    return false;
+}
+
+/*
  * Read an entry into a buffer allocated by the caller.
  */
 bool mzReadZipEntry(const ZipArchive* pArchive, const ZipEntry* pEntry,
@@ -1016,7 +1090,7 @@ bool mzExtractRecursive(const ZipArchive *pArchive,
         if (callback != NULL) callback(targetFile, cookie);
     }
 
-    LOGD("Extracted %d file(s)\n", extractCount);
+    LOGV("Extracted %d file(s)\n", extractCount);
 
     free(helper.buf);
     free(zpath);