X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/479cd5de40ca8029c79e780170fa7c0af7ec0297..c2a331e02732bb6a04a42ebf646d54b4373ad122:/src/common/zipstrm.cpp

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 54cb0c8638..6a7ebb12cc 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -6,7 +6,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "zipstrm.h"
 #endif
 
@@ -24,6 +24,7 @@
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 #include "wx/zipstrm.h"
+#include "wx/utils.h"
 
 /* Not the right solution (paths in makefiles) but... */
 #ifdef __BORLANDC__
@@ -39,15 +40,15 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
 
     m_Pos = 0;
     m_Size = 0;
-    m_Archive = (void*) unzOpen(archive.fn_str());
+    m_Archive = (void*) unzOpen(archive.mb_str());
     if (m_Archive == NULL)
     {
-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;
         return;
     }
-    if (unzLocateFile((unzFile)m_Archive, file.fn_str(), 0) != UNZ_OK)
+    if (unzLocateFile((unzFile)m_Archive, file.mb_str(), 0) != UNZ_OK)
     {
-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;
         return;
     }
 
@@ -55,7 +56,7 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
 
     if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
     {
-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;
         return;
     }
     m_Size = (size_t)zinfo.uncompressed_size;
@@ -73,13 +74,32 @@ wxZipInputStream::~wxZipInputStream()
     }
 }
 
+bool wxZipInputStream::Eof() const
+{
+    wxASSERT_MSG( m_Pos <= (off_t)m_Size,
+                  _T("wxZipInputStream: invalid current position") );
+
+    return m_Pos >= (off_t)m_Size;
+}
 
 
 size_t wxZipInputStream::OnSysRead(void *buffer, size_t bufsize)
 {
-    if (m_Pos + bufsize > m_Size) bufsize = m_Size - m_Pos;
+    wxASSERT_MSG( m_Pos <= (off_t)m_Size,
+                  _T("wxZipInputStream: invalid current position") );
+
+    if ( m_Pos >= (off_t)m_Size )
+    {
+        m_lasterror = wxSTREAM_EOF;
+        return 0;
+    }
+
+    if (m_Pos + bufsize > m_Size)
+        bufsize = m_Size - m_Pos;
+
     unzReadCurrentFile((unzFile)m_Archive, buffer, bufsize);
     m_Pos += bufsize;
+
     return bufsize;
 }
 
@@ -87,10 +107,14 @@ size_t wxZipInputStream::OnSysRead(void *buffer, size_t bufsize)
 
 off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
 {
+    // NB: since ZIP files don't natively support seeking, we have to 
+    //     implement a brute force workaround -- reading all the data
+    //     between current and the new position (or between beginning of 
+    //     the file and new position...)
+
     off_t nextpos;
-    void *buf;
 
-    switch (mode)
+    switch ( mode )
     {
         case wxFromCurrent : nextpos = seek + m_Pos; break;
         case wxFromStart : nextpos = seek; break;
@@ -98,23 +122,33 @@ off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
         default : nextpos = m_Pos; break; /* just to fool compiler, never happens */
     }
 
-    // cheated seeking :
-    if (nextpos > m_Pos)
+    size_t toskip = 0;
+    if ( nextpos > m_Pos )
     {
-        buf = malloc(nextpos - m_Pos);
-        unzReadCurrentFile((unzFile)m_Archive, buf, nextpos -  m_Pos);
-        free(buf);
+        toskip = nextpos - m_Pos;
     }
-    else if (nextpos < m_Pos) {
+    else
+    {
         unzCloseCurrentFile((unzFile)m_Archive);
         if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
         {
-            m_lasterror = wxStream_READ_ERR;
+            m_lasterror = wxSTREAM_READ_ERROR;
             return m_Pos;
         }
-        buf = malloc(nextpos);
-        unzReadCurrentFile((unzFile)m_Archive, buf, nextpos);
-        free(buf);
+        toskip = nextpos;
+    }
+        
+    if ( toskip > 0 )
+    {
+        const size_t BUFSIZE = 4096;
+        size_t sz;
+        char buffer[BUFSIZE];
+        while ( toskip > 0 )
+        {
+            sz = wxMin(toskip, BUFSIZE);
+            unzReadCurrentFile((unzFile)m_Archive, buffer, sz);
+            toskip -= sz;
+        }
     }
 
     m_Pos = nextpos;