Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 458db30ee3e58ae991c7bb8485e335d1a3ee7751..d2b6100cc2086cc76b4910cf39b340375015d1e5 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -19,7 +19,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM && wxUSE_ZLIB

 
 #ifndef WXPRECOMP
     #include "wx/intl.h"
 
 #ifndef WXPRECOMP
     #include "wx/intl.h"


@@ -32,12 +32,33 @@
 #include "wx/fs_zip.h"
 
 
 #include "wx/fs_zip.h"
 
 

+//---------------------------------------------------------------------------
+// wxZipFSInputStream
+//---------------------------------------------------------------------------
+// Helper class for wxZipFSHandler
+
+class wxZipFSInputStream : public wxZipInputStream
+{
+    public:
+       wxZipFSInputStream(wxFSFile *file)
+               : wxZipInputStream(*file->GetStream())
+       {
+            m_file = file;
+#if 1 //WXWIN_COMPATIBILITY_2_6
+            m_allowSeeking = true;
+#endif
+       }
+
+       virtual ~wxZipFSInputStream() { delete m_file; }
+
+    private:
+       wxFSFile *m_file;
+};
+

 //----------------------------------------------------------------------------
 // wxZipFSHandler
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
 // wxZipFSHandler
 //----------------------------------------------------------------------------
 

-
-

 wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 {
     m_Archive = NULL;
 wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 {
     m_Archive = NULL;


@@ -51,43 +72,25 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 wxZipFSHandler::~wxZipFSHandler()
 {
     if (m_Archive)
 wxZipFSHandler::~wxZipFSHandler()
 {
     if (m_Archive)

-        CloseArchive(m_Archive);
+        delete m_Archive;

     if (m_DirsFound)
         delete m_DirsFound;
 }
 
 
 
     if (m_DirsFound)
         delete m_DirsFound;
 }
 
 
 

-void wxZipFSHandler::CloseArchive(wxZipInputStream *archive)
-{
-    wxInputStream *stream = archive->GetFilterInputStream();
-    delete archive;
-    delete stream;
-}
-
-
-

 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    return (p == wxT("zip")) &&
-           (GetProtocol(GetLeftLocation(location)) == wxT("file"));
+    return (p == wxT("zip"));

 }
 
 
 }
 
 

-
-

 wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);
     wxString left = GetLeftLocation(location);
 wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);
     wxString left = GetLeftLocation(location);

-    wxInputStream *s;
-
-    if (GetProtocol(left) != wxT("file"))
-    {
-        wxLogError(_("ZIP handler currently supports only local files!"));
-        return NULL;
-    }
+    wxZipInputStream *s;

 
     if (right.Contains(wxT("./")))
     {
 
     if (right.Contains(wxT("./")))
     {


@@ -99,12 +102,26 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
 
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 
 
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 

-    wxFileName leftFilename = wxFileSystem::URLToFileName(left);
+    // a new wxFileSystem object is needed here to avoid infinite recursion
+    wxFSFile *leftFile = wxFileSystem().OpenFile(left);
+    if (!leftFile)
+       return NULL;

 
 

-    s = new wxZipInputStream(leftFilename.GetFullPath(), right);
-    if (s && s->IsOk() )
+    s = new wxZipFSInputStream(leftFile);
+    if (s && s->IsOk())

     {
     {

-        return new wxFSFile(s,
+       bool found = false;
+       while (!found)
+       {
+           wxZipEntry *ent = s->GetNextEntry();
+           if (!ent)
+               break;
+           if (ent->GetInternalName() == right)
+               found = true;
+           delete ent;
+       }
+       if (found)
+           return new wxFSFile(s,

                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
                             GetAnchor(location)
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
                             GetAnchor(location)


@@ -125,20 +142,14 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     wxString right = GetRightLocation(spec);
     wxString left = GetLeftLocation(spec);
 
     wxString right = GetRightLocation(spec);
     wxString left = GetLeftLocation(spec);
 

-    if (right.Last() == wxT('/')) right.RemoveLast();
+    if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast();

 
     if (m_Archive)
     {
 
     if (m_Archive)
     {

-        CloseArchive(m_Archive);
+        delete m_Archive;

         m_Archive = NULL;
     }
 
         m_Archive = NULL;
     }
 

-    if (GetProtocol(left) != wxT("file"))
-    {
-        wxLogError(_("ZIP handler currently supports only local files!"));
-        return wxEmptyString;
-    }
-

     switch (flags)
     {
         case wxFILE:
     switch (flags)
     {
         case wxFILE:


@@ -150,17 +161,24 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     }
 
     m_ZipFile = left;
     }
 
     m_ZipFile = left;

-    wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
-    m_Archive = new wxZipInputStream(*new wxFFileInputStream(nativename));
+
+    wxFSFile *leftFile = wxFileSystem().OpenFile(left);
+    if (leftFile)
+        m_Archive = new wxZipFSInputStream(leftFile);
+

     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));

+    if (m_BaseDir.StartsWith(wxT("/")))
+        m_BaseDir = m_BaseDir.Mid(1);

 
     if (m_Archive)
     {
         if (m_AllowDirs)
         {
             delete m_DirsFound;
 
     if (m_Archive)
     {
         if (m_AllowDirs)
         {
             delete m_DirsFound;

-            m_DirsFound = new wxLongToLongHashMap();
+            m_DirsFound = new wxZipFilenameHashMap();
+            if (right.empty())  // allow "/" to match the archive root
+                return spec;

         }
         return DoFind();
     }
         }
         return DoFind();
     }


@@ -187,7 +205,7 @@ wxString wxZipFSHandler::DoFind()
         wxZipEntry *entry = m_Archive->GetNextEntry();
         if (!entry)
         {
         wxZipEntry *entry = m_Archive->GetNextEntry();
         if (!entry)
         {

-            CloseArchive(m_Archive);
+            delete m_Archive;

             m_Archive = NULL;
             break;
         }
             m_Archive = NULL;
             break;
         }


@@ -197,17 +215,14 @@ wxString wxZipFSHandler::DoFind()
         if (m_AllowDirs)
         {
             dir = namestr.BeforeLast(wxT('/'));
         if (m_AllowDirs)
         {
             dir = namestr.BeforeLast(wxT('/'));

-            while (!dir.IsEmpty())
+            while (!dir.empty())

             {
             {

-                long key = 0;
-                for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
-                wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
-                if (it == m_DirsFound->end())
+                if( m_DirsFound->find(dir) == m_DirsFound->end() )

                 {
                 {

-                    (*m_DirsFound)[key] = 1;
+                    (*m_DirsFound)[dir] = 1;

                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));

-                    if (!filename.IsEmpty() && m_BaseDir == dir &&
+                    if (!filename.empty() && m_BaseDir == dir &&

                                 wxMatchWild(m_Pattern, filename, false))
                         match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename;
                 }
                                 wxMatchWild(m_Pattern, filename, false))
                         match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename;
                 }


@@ -218,7 +233,7 @@ wxString wxZipFSHandler::DoFind()
 
         filename = namestr.AfterLast(wxT('/'));
         dir = namestr.BeforeLast(wxT('/'));
 
         filename = namestr.AfterLast(wxT('/'));
         dir = namestr.BeforeLast(wxT('/'));

-        if (m_AllowFiles && !filename.IsEmpty() && m_BaseDir == dir &&
+        if (m_AllowFiles && !filename.empty() && m_BaseDir == dir &&

                             wxMatchWild(m_Pattern, filename, false))
             match = m_ZipFile + wxT("#zip:") + namestr;
     }
                             wxMatchWild(m_Pattern, filename, false))
             match = m_ZipFile + wxT("#zip:") + namestr;
     }