more encoding names for AIX/Solaris/IRIX

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index dcce84cc10ad422057bf65d3790923387c76e2ad..225159473b6ecf79701c717167bccdcc4d25fa13 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -3,60 +3,85 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// CVS-ID:      $Id$
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "fs_zip.h"

 #endif
 
 #include "wx/wxprec.h"
 
 #endif
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #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
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/filesys.h"
 #endif
 
 #include "wx/filesys.h"

+#include "wx/wfstream.h"

 #include "wx/zipstrm.h"
 #include "wx/fs_zip.h"
 
 #include "wx/zipstrm.h"
 #include "wx/fs_zip.h"
 

-/* Not the right solution (paths in makefiles) but... */
-#ifdef __BORLANDC__
-#include "../common/unzip.h"
-#else
-#include "unzip.h"
-#endif

 
 

+//---------------------------------------------------------------------------
+// wxZipFSInputStream
+//---------------------------------------------------------------------------
+// Helper class for wxZipFSHandler

 
 

-//--------------------------------------------------------------------------------
-// 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() : wxFileSystemHandler()
 {
     m_Archive = NULL;
     m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
 
 wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 {
     m_Archive = NULL;
     m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;

-    m_AllowDirs = m_AllowFiles = TRUE;
+    m_AllowDirs = m_AllowFiles = true;
+    m_DirsFound = NULL;

 }
 
 
 
 wxZipFSHandler::~wxZipFSHandler()
 {
 }
 
 
 
 wxZipFSHandler::~wxZipFSHandler()
 {

-    if (m_Archive)         
-        unzClose((unzFile)m_Archive);
+    Cleanup();

 }
 
 
 }
 
 

+void wxZipFSHandler::Cleanup()
+{
+    wxDELETE(m_Archive);
+    wxDELETE(m_DirsFound);
+}
+ 
+

 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {


@@ -65,28 +90,49 @@ bool wxZipFSHandler::CanOpen(const wxString& location)
 }
 
 
 }
 
 

-
-

 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;
+    wxZipInputStream *s;

 
 

-    if (GetProtocol(left) != wxT("file")) 
+    if (right.Contains(wxT("./")))

     {
     {

-        wxLogError(_("ZIP handler currently supports only local files!"));
-        return NULL;
+        if (right.GetChar(0) != wxT('/')) right = wxT('/') + right;
+        wxFileName rightPart(right, wxPATH_UNIX);
+        rightPart.Normalize(wxPATH_NORM_DOTS, wxT("/"), wxPATH_UNIX);
+        right = rightPart.GetFullPath(wxPATH_UNIX);

     }
 
     }
 

-    s = new wxZipInputStream(left, right);
-    if (s && (s->LastError() == wxStream_NOERROR)) 
+    if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
+
+    // a new wxFileSystem object is needed here to avoid infinite recursion
+    wxFSFile *leftFile = wxFileSystem().OpenFile(left);
+    if (!leftFile)
+       return NULL;
+
+    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),
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),

-                            GetAnchor(location),
-                            wxDateTime(wxFileModificationTime(left)));
+                            GetAnchor(location)
+#if wxUSE_DATETIME
+                            , wxDateTime(wxFileModificationTime(left))
+#endif // wxUSE_DATETIME
+                            );

     }
 
     delete s;
     }
 
     delete s;


@@ -99,41 +145,46 @@ 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 (m_Archive) 
+    if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast();
+
+    if (m_Archive)

     {
     {

-        unzClose((unzFile)m_Archive);
+        delete m_Archive;

         m_Archive = NULL;
     }
 
         m_Archive = NULL;
     }
 

-    if (GetProtocol(left) != wxT("file")) 
-        return wxEmptyString;
-
-    switch (flags) 
+    switch (flags)

     {
     {

-        case wxFILE: 
-            m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;
-        case wxDIR: 
-            m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;
-        default: 
-            m_AllowDirs = m_AllowFiles = TRUE; break;
+        case wxFILE:
+            m_AllowDirs = false, m_AllowFiles = true; break;
+        case wxDIR:
+            m_AllowDirs = true, m_AllowFiles = false; break;
+        default:
+            m_AllowDirs = m_AllowFiles = true; break;

     }
 
     m_ZipFile = left;
     }
 
     m_ZipFile = left;

-    m_Archive = (void*) unzOpen(m_ZipFile.mb_str());
+
+    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_Archive)

     {
     {

-        if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK) 
+        if (m_AllowDirs)

         {
         {

-            unzClose((unzFile)m_Archive);
-            m_Archive = NULL;        
+            delete m_DirsFound;
+            m_DirsFound = new wxZipFilenameHashMap();
+            if (right.empty())  // allow "/" to match the archive root
+                return spec;

         }
         }

-        else return DoFind();
+        return DoFind();

     }
     return wxEmptyString;
 }
     }
     return wxEmptyString;
 }


@@ -150,47 +201,51 @@ wxString wxZipFSHandler::FindNext()
 
 wxString wxZipFSHandler::DoFind()
 {
 
 wxString wxZipFSHandler::DoFind()
 {

-    static char namebuf[1024]; // char, not wxChar!
-    char *c;
-    wxString fn, dir, name;
+    wxString namestr, dir, filename;

     wxString match = wxEmptyString;
     wxString match = wxEmptyString;

-    bool wasdir;

 
     while (match == wxEmptyString)
     {
 
     while (match == wxEmptyString)
     {

-        unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0);
-        for (c = namebuf; *c; c++) if (*c == wxT('\\')) *c = wxT('/');
-        fn = namebuf;
-        if (fn.Length() > 0 && fn.Last() == wxT('/')) 
+        wxZipEntry *entry = m_Archive->GetNextEntry();
+        if (!entry)

         {
         {

-            fn.RemoveLast();
-            wasdir = TRUE;
+            delete m_Archive;
+            m_Archive = NULL;
+            break;

         }
         }

-        else wasdir = FALSE;
-
-        name = fn.AfterLast(wxT('/'));
-        dir = fn.BeforeLast(wxT('/'));
+        namestr = entry->GetName(wxPATH_UNIX);
+        delete entry;

 
 

-        if (dir == m_BaseDir) 
+        if (m_AllowDirs)

         {
         {

-            if (m_AllowFiles && !wasdir && wxMatchWild(m_Pattern, name, FALSE))
-                match = m_ZipFile + wxT("#zip:") + fn;
-            if (m_AllowDirs && wasdir && wxMatchWild(m_Pattern, name, FALSE))
-                match = m_ZipFile + wxT("#zip:") + fn;
-        }
-        
-        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK) 
-        {
-            unzClose((unzFile)m_Archive);
-            m_Archive = NULL;
-            break;
+            dir = namestr.BeforeLast(wxT('/'));
+            while (!dir.empty())
+            {
+                if( m_DirsFound->find(dir) == m_DirsFound->end() )
+                {
+                    (*m_DirsFound)[dir] = 1;
+                    filename = dir.AfterLast(wxT('/'));
+                    dir = dir.BeforeLast(wxT('/'));
+                    if (!filename.empty() && m_BaseDir == dir &&
+                                wxMatchWild(m_Pattern, filename, false))
+                        match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename;
+                }
+                else
+                    break; // already tranversed
+            }

         }
         }

+
+        filename = namestr.AfterLast(wxT('/'));
+        dir = namestr.BeforeLast(wxT('/'));
+        if (m_AllowFiles && !filename.empty() && m_BaseDir == dir &&
+                            wxMatchWild(m_Pattern, filename, false))
+            match = m_ZipFile + wxT("#zip:") + namestr;

     }
     }

-    
+

     return match;
 }
 
 
 
     return match;
 }
 
 
 

-#endif 
+#endif

       //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
       //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM