get rid of the silly unzip_stream

[picodrive.git] / pico / cart.c

diff --git a/pico/cart.c b/pico/cart.c
index a5c563d..377ecbc 100644 (file)
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -11,7 +11,6 @@
 #include "../zlib/zlib.h"\r
 #include "../cpu/debug.h"\r
 #include "../unzip/unzip.h"\r
-#include "../unzip/unzip_stream.h"\r
 \r
 \r
 static int rom_alloc_size;\r
@@ -90,6 +89,16 @@ static const char *get_ext(const char *path)
   return ext;\r
 }\r
 \r
+struct zip_file {\r
+  pm_file file;\r
+  ZIP *zip;\r
+  struct zipent *entry;\r
+  z_stream stream;\r
+  unsigned char inbuf[16384];\r
+  long start;\r
+  unsigned int pos;\r
+};\r
+\r
 pm_file *pm_open(const char *path)\r
 {\r
   pm_file *file = NULL;\r
@@ -102,10 +111,10 @@ pm_file *pm_open(const char *path)
   ext = get_ext(path);\r
   if (strcasecmp(ext, "zip") == 0)\r
   {\r
+    struct zip_file *zfile = NULL;\r
     struct zipent *zipentry;\r
-    gzFile gzf = NULL;\r
     ZIP *zipfile;\r
-    int i;\r
+    int i, ret;\r
 \r
     zipfile = openzip(path);\r
     if (zipfile != NULL)\r
@@ -127,25 +136,29 @@ pm_file *pm_open(const char *path)
       goto zip_failed;\r
 \r
 found_rom_zip:\r
-      /* try to convert to gzip stream, so we could use standard gzio functions from zlib */\r
-      gzf = zip2gz(zipfile, zipentry);\r
-      if (gzf == NULL)  goto zip_failed;\r
-\r
-      file = calloc(1, sizeof(*file));\r
-      if (file == NULL) goto zip_failed;\r
-      file->file  = zipfile;\r
-      file->param = gzf;\r
-      file->size  = zipentry->uncompressed_size;\r
-      file->type  = PMT_ZIP;\r
-      strncpy(file->ext, ext, sizeof(file->ext) - 1);\r
-      return file;\r
+      zfile = calloc(1, sizeof(*zfile));\r
+      if (zfile == NULL)\r
+        goto zip_failed;\r
+      ret = seekcompresszip(zipfile, zipentry);\r
+      if (ret != 0)\r
+        goto zip_failed;\r
+      ret = inflateInit2(&zfile->stream, -15);\r
+      if (ret != Z_OK) {\r
+        elprintf(EL_STATUS, "zip: inflateInit2 %d", ret);\r
+        goto zip_failed;\r
+      }\r
+      zfile->zip = zipfile;\r
+      zfile->entry = zipentry;\r
+      zfile->start = ftell(zipfile->fp);\r
+      zfile->file.file = zfile;\r
+      zfile->file.size = zipentry->uncompressed_size;\r
+      zfile->file.type = PMT_ZIP;\r
+      strncpy(zfile->file.ext, ext, sizeof(zfile->file.ext) - 1);\r
+      return &zfile->file;\r
 \r
 zip_failed:\r
-      if (gzf) {\r
-        gzclose(gzf);\r
-        zipfile->fp = NULL; // gzclose() closed it\r
-      }\r
       closezip(zipfile);\r
+      free(zfile);\r
       return NULL;\r
     }\r
   }\r
@@ -246,13 +259,33 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream)
   }\r
   else if (stream->type == PMT_ZIP)\r
   {\r
-    gzFile gf = stream->param;\r
-    int err;\r
-    ret = gzread(gf, ptr, bytes);\r
-    err = gzerror2(gf);\r
-    if (ret > 0 && (err == Z_DATA_ERROR || err == Z_STREAM_END))\r
-      /* we must reset stream pointer or else next seek/read fails */\r
-      gzrewind(gf);\r
+    struct zip_file *z = stream->file;\r
+\r
+    if (z->entry->compression_method == 0) {\r
+      int ret = fread(ptr, 1, bytes, z->zip->fp);\r
+      z->pos += ret;\r
+      return ret;\r
+    }\r
+\r
+    z->stream.next_out = ptr;\r
+    z->stream.avail_out = bytes;\r
+    while (z->stream.avail_out != 0) {\r
+      if (z->stream.avail_in == 0) {\r
+        z->stream.avail_in = fread(z->inbuf, 1, sizeof(z->inbuf), z->zip->fp);\r
+        if (z->stream.avail_in == 0)\r
+          break;\r
+        z->stream.next_in = z->inbuf;\r
+      }\r
+      ret = inflate(&z->stream, Z_NO_FLUSH);\r
+      if (ret == Z_STREAM_END)\r
+        break;\r
+      if (ret != Z_OK) {\r
+        elprintf(EL_STATUS, "zip: inflate: %d", ret);\r
+        return 0;\r
+      }\r
+    }\r
+    z->pos += bytes - z->stream.avail_out;\r
+    return bytes - z->stream.avail_out;\r
   }\r
   else if (stream->type == PMT_CSO)\r
   {\r
@@ -331,12 +364,45 @@ int pm_seek(pm_file *stream, long offset, int whence)
   }\r
   else if (stream->type == PMT_ZIP)\r
   {\r
-    if (PicoMessage != NULL && offset > 6*1024*1024) {\r
-      long pos = gztell((gzFile) stream->param);\r
-      if (offset < pos || offset - pos > 6*1024*1024)\r
-        PicoMessage("Decompressing data...");\r
+    struct zip_file *z = stream->file;\r
+    unsigned int pos = z->pos;\r
+    int ret;\r
+\r
+    switch (whence)\r
+    {\r
+      case SEEK_CUR: pos += offset; break;\r
+      case SEEK_SET: pos  = offset; break;\r
+      case SEEK_END: pos  = stream->size - offset; break;\r
+    }\r
+    if (z->entry->compression_method == 0) {\r
+      ret = fseek(z->zip->fp, z->start + pos, SEEK_SET);\r
+      if (ret == 0)\r
+        return (z->pos = pos);\r
+      return -1;\r
+    }\r
+    offset = pos - z->pos;\r
+    if (pos < z->pos) {\r
+      // full decompress from the start\r
+      fseek(z->zip->fp, z->start, SEEK_SET);\r
+      z->stream.avail_in = 0;\r
+      z->stream.next_in = z->inbuf;\r
+      inflateReset(&z->stream);\r
+      z->pos = 0;\r
+      offset = pos;\r
+    }\r
+\r
+    if (PicoMessage != NULL && offset > 4 * 1024 * 1024)\r
+      PicoMessage("Decompressing data...");\r
+\r
+    while (offset > 0) {\r
+      char buf[16 * 1024];\r
+      size_t l = offset > sizeof(buf) ? sizeof(buf) : offset;\r
+      ret = pm_read(buf, l, stream);\r
+      if (ret != l)\r
+        break;\r
+      offset -= l;\r
     }\r
-    return gzseek((gzFile) stream->param, offset, whence);\r
+    return z->pos;\r
   }\r
   else if (stream->type == PMT_CSO)\r
   {\r
@@ -365,10 +431,9 @@ int pm_close(pm_file *fp)
   }\r
   else if (fp->type == PMT_ZIP)\r
   {\r
-    ZIP *zipfile = fp->file;\r
-    gzclose((gzFile) fp->param);\r
-    zipfile->fp = NULL; // gzclose() closed it\r
-    closezip(zipfile);\r
+    struct zip_file *z = fp->file;\r
+    inflateEnd(&z->stream);\r
+    closezip(z->zip);\r
   }\r
   else if (fp->type == PMT_CSO)\r
   {\r