correct to int32 for range comparison

[wxWidgets.git] / src / common / zipstrm.cpp

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 22b27e5439d88e46a4711995e47f2e9dcbc9933c..6bf4f2aed31c108af149660e825707066acdf14c 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -3,10 +3,10 @@
 // Purpose:     input stream for ZIP archive access
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     input stream for ZIP archive access
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "zipstrm.h"
 #endif
 
 #pragma implementation "zipstrm.h"
 #endif
 


@@ -24,6 +24,7 @@
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 #include "wx/zipstrm.h"
 #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__
 
 /* Not the right solution (paths in makefiles) but... */
 #ifdef __BORLANDC__


@@ -39,15 +40,16 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
 
     m_Pos = 0;
     m_Size = 0;
 
     m_Pos = 0;
     m_Size = 0;

-    m_Archive = (void*) unzOpen(archive.fn_str());
+    m_Archive = (void*) unzOpen(archive.mb_str(wxConvFile));

     if (m_Archive == NULL)
     {
     if (m_Archive == NULL)
     {

-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;

         return;
     }
         return;
     }

-    if (unzLocateFile((unzFile)m_Archive, file.fn_str(), 0) != UNZ_OK)
+    // TODO what encoding does ZIP use?
+    if (unzLocateFile((unzFile)m_Archive, file.ToAscii(), 0) != UNZ_OK)

     {
     {

-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;

         return;
     }
 
         return;
     }
 


@@ -55,10 +57,10 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
 
     if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
     {
 
     if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
     {

-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;

         return;
     }
         return;
     }

-    m_Size = zinfo.uncompressed_size;
+    m_Size = (size_t)zinfo.uncompressed_size;

 }
 
 
 }
 
 


@@ -73,24 +75,47 @@ wxZipInputStream::~wxZipInputStream()
     }
 }
 
     }
 }
 

+bool wxZipInputStream::Eof() const
+{
+    wxASSERT_MSG( m_Pos <= (wxFileOffset)m_Size,
+                  _T("wxZipInputStream: invalid current position") );
+
+    return m_Pos >= (wxFileOffset)m_Size;
+}

 
 
 size_t wxZipInputStream::OnSysRead(void *buffer, size_t bufsize)
 {
 
 
 size_t wxZipInputStream::OnSysRead(void *buffer, size_t bufsize)
 {

-    if (m_Pos + bufsize > m_Size) bufsize = m_Size - m_Pos;
+    wxASSERT_MSG( m_Pos <= (wxFileOffset)m_Size,
+                  _T("wxZipInputStream: invalid current position") );
+
+    if ( m_Pos >= (wxFileOffset)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;
     unzReadCurrentFile((unzFile)m_Archive, buffer, bufsize);
     m_Pos += bufsize;

+

     return bufsize;
 }
 
 
 
     return bufsize;
 }
 
 
 

-off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
+wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)

 {
 {

-    off_t nextpos;
-    void *buf;
+    // 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...)
+
+    wxFileOffset nextpos;

 
 

-    switch (mode)
+    switch ( mode )

     {
         case wxFromCurrent : nextpos = seek + m_Pos; break;
         case wxFromStart : nextpos = seek; break;
     {
         case wxFromCurrent : nextpos = seek + m_Pos; break;
         case wxFromStart : nextpos = seek; break;


@@ -98,23 +123,33 @@ off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
         default : nextpos = m_Pos; break; /* just to fool compiler, never happens */
     }
 
         default : nextpos = m_Pos; break; /* just to fool compiler, never happens */
     }
 

-    // cheated seeking :
-    if (nextpos > m_Pos)
+    size_t toskip;
+    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)
         {
         unzCloseCurrentFile((unzFile)m_Archive);
         if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
         {

-            m_lasterror = wxStream_READ_ERR;
+            m_lasterror = wxSTREAM_READ_ERROR;

             return m_Pos;
         }
             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;
     }
 
     m_Pos = nextpos;