Ticket #9201: unzip_cpp.patch

unzip.cpp

@@ -107 +107 @@
 #include "common/unzip.h"
 #include "common/file.h"
 
+#ifdef ZIP_HASH
+#include "common/hashmap.h"
+#include "common/hash-str.h"
+#endif
+
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
@@ -362 +367 @@
         uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
 } file_in_zip_read_info_s;
 
+#ifdef ZIP_HASH
 
+typedef struct {
+        uLong num_file;                                 /* number of the current file in the zipfile*/
+        uLong pos_in_central_dir;               /* pos of the current file in the central dir*/
+        uLong current_file_ok;                  /* flag about the usability of the current file*/
+        unz_file_info cur_file_info;                                    /* public info about the current file in zip*/
+        unz_file_info_internal cur_file_info_internal;  /* private info about it*/
+} cached_file_in_zip;
+
+typedef Common::HashMap<Common::String, cached_file_in_zip, Common::IgnoreCase_Hash, 
+        Common::IgnoreCase_EqualTo> ZipHash;
+
+#endif
+
 /* unz_s contain internal information about the zipfile
 */
 typedef struct {
@@ -382 +401 @@
         unz_file_info_internal cur_file_info_internal;  /* private info about it*/
         file_in_zip_read_info_s* pfile_in_zip_read;             /* structure about the current
                                                                                                         file if we are decompressing it */
+#ifdef ZIP_HASH
+        ZipHash _hash;
+#endif
 } unz_s;
 
 /* ===========================================================================
@@ -589 +611 @@
         us->central_pos = central_pos;
         us->pfile_in_zip_read = NULL;
 
+#ifdef ZIP_HASH
+        err = unzGoToFirstFile((unzFile)us);
+
+        while (err == UNZ_OK) {
+                // Get the file details
+                char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+                unzGetCurrentFileInfo(us, NULL, szCurrentFileName, sizeof(szCurrentFileName) - 1,
+                                                        NULL, 0, NULL, 0);
+
+                // Save details into the hash
+                cached_file_in_zip fe;
+                fe.num_file = us->num_file;
+                fe.pos_in_central_dir = us->pos_in_central_dir;
+                fe.current_file_ok = us->current_file_ok;
+                fe.cur_file_info = us->cur_file_info;
+                fe.cur_file_info_internal = us->cur_file_info_internal;
+
+                us->_hash[Common::String(szCurrentFileName)] = fe;
+
+                // Move to the next file
+                err = unzGoToNextFile((unzFile)us);
+        }
+#else
         unzGoToFirstFile((unzFile)us);
+#endif
         return (unzFile)us;
 }
 
@@ -870 +916 @@
         return err;
 }
 
-
 /*
   Try locate the file szFileName in the zipfile.
   For the iCaseSensitivity signification, see unzipStringFileNameCompare
@@ -881 +926 @@
 */
 int unzLocateFile(unzFile file, const char *szFileName, int iCaseSensitivity) {
         unz_s* s;
-        int err;
 
-
-        uLong num_fileSaved;
-        uLong pos_in_central_dirSaved;
-
-
         if (file==NULL)
                 return UNZ_PARAMERROR;
 
@@ -898 +937 @@
         if (!s->current_file_ok)
                 return UNZ_END_OF_LIST_OF_FILE;
 
+#ifdef ZIP_HASH
+        // Check to see if the entry exists
+        ZipHash::iterator i = s->_hash.find(Common::String(szFileName));
+        if (i == s->_hash.end())
+                return UNZ_END_OF_LIST_OF_FILE;
+
+        // Found it, so reset the details in the main structure
+        cached_file_in_zip &fe = i->_value;
+        s->num_file = fe.num_file;
+        s->pos_in_central_dir = fe.pos_in_central_dir;
+        s->current_file_ok = fe.current_file_ok;
+        s->cur_file_info = fe.cur_file_info;
+        s->cur_file_info_internal = fe.cur_file_info_internal;
+
+        return UNZ_OK;
+#else
+        int err;
+
+        uLong num_fileSaved;
+        uLong pos_in_central_dirSaved;
+
         num_fileSaved = s->num_file;
         pos_in_central_dirSaved = s->pos_in_central_dir;
 
@@ -916 +976 @@
 
         s->num_file = num_fileSaved ;
         s->pos_in_central_dir = pos_in_central_dirSaved ;
+
         return err;
+#endif
 }