fixed bug with not NUL-terminating the string in GAddress_UNIX_SetPath

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 56647fcd127e3e8a039999ac640c8bb1306b1f41..97cfa0bb1b9da6c8dbf57fbe81e4d2944f818256 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -3,35 +3,41 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

+// CVS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 

+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "fs_zip.h"

 #endif
 
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 

-#if !wxUSE_SOCKETS
-    #undef wxUSE_FS_ZIP
-    #define wxUSE_FS_ZIP 0
-#endif
-
-#if wxUSE_FS_ZIP
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM

 
 #ifndef WXPRECOMP
 
 #ifndef WXPRECOMP

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

 #endif
 
 #endif
 

+#include "wx/hash.h"

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

-#include "wx/zipstream.h"
+#include "wx/zipstrm.h"

 #include "wx/fs_zip.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
+

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


@@ -39,10 +45,31 @@
 
 
 
 
 
 

+wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
+{
+    m_Archive = NULL;
+    m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
+    m_AllowDirs = m_AllowFiles = TRUE;
+    m_DirsFound = NULL;
+}
+
+
+
+wxZipFSHandler::~wxZipFSHandler()
+{
+    if (m_Archive)
+        unzClose((unzFile)m_Archive);
+    if (m_DirsFound)
+        delete m_DirsFound;
+}
+
+
+

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

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

 }
 
 
 }
 
 


@@ -54,24 +81,146 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
     wxString left = GetLeftLocation(location);
     wxInputStream *s;
 
     wxString left = GetLeftLocation(location);
     wxInputStream *s;
 

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

         return NULL;
     }
 
         return NULL;
     }
 

+    if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
+

     s = new wxZipInputStream(left, right);
     s = new wxZipInputStream(left, right);

-    if (s && (s -> LastError() == wxStream_NOERROR)) {
+    if (s && (s->LastError() == wxStream_NOERROR))
+    {

         return new wxFSFile(s,
         return new wxFSFile(s,

-                            left + "#zip:" + right,
+                            left + wxT("#zip:") + right,

                             GetMimeTypeFromExt(location),
                             GetMimeTypeFromExt(location),

-                            GetAnchor(location));
+                            GetAnchor(location),
+                            wxDateTime(wxFileModificationTime(left)));

     }
     }

-    else return NULL;
+
+    delete s;
+    return NULL;

 }
 
 
 
 }
 
 
 

-wxZipFSHandler::~wxZipFSHandler()
+wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)

 {
 {

+    wxString right = GetRightLocation(spec);
+    wxString left = GetLeftLocation(spec);
+
+    if (right.Last() == wxT('/')) right.RemoveLast();
+
+    if (m_Archive)
+    {
+        unzClose((unzFile)m_Archive);
+        m_Archive = NULL;
+    }
+
+    if (GetProtocol(left) != wxT("file"))
+    {
+        wxLogError(_("ZIP handler currently supports only local files!"));
+        return wxEmptyString;
+    }
+
+    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;
+    }
+
+    m_ZipFile = left;
+    m_Archive = (void*) unzOpen(m_ZipFile.mb_str());
+    m_Pattern = right.AfterLast(wxT('/'));
+    m_BaseDir = right.BeforeLast(wxT('/'));
+
+    if (m_Archive)
+    {
+        if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK)
+        {
+            unzClose((unzFile)m_Archive);
+            m_Archive = NULL;
+        }
+        else
+        {
+            if (m_AllowDirs)
+            {
+                delete m_DirsFound;
+                m_DirsFound = new wxHashTableLong();
+            }
+            return DoFind();
+        }
+    }
+    return wxEmptyString;
+}
+
+
+
+wxString wxZipFSHandler::FindNext()
+{
+    if (!m_Archive) return wxEmptyString;
+    return DoFind();

 }
 
 }
 

-#endif // wxUSE_FS_ZIP
+
+
+wxString wxZipFSHandler::DoFind()
+{
+    static char namebuf[1024]; // char, not wxChar!
+    char *c;
+    wxString namestr, dir, filename;
+    wxString 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('/');
+        namestr = namebuf;
+
+        if (m_AllowDirs)
+        {
+            dir = namestr.BeforeLast(wxT('/'));
+            while (!dir.IsEmpty())
+            {
+                long key = 0;
+                for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
+                if (m_DirsFound->Get(key) == wxNOT_FOUND)
+                {
+                    m_DirsFound->Put(key, 1);
+                    filename = dir.AfterLast(wxT('/'));
+                    dir = dir.BeforeLast(wxT('/'));
+                    if (!filename.IsEmpty() && 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.IsEmpty() && m_BaseDir == dir &&
+                            wxMatchWild(m_Pattern, filename, FALSE))
+            match = m_ZipFile + wxT("#zip:") + namestr;
+
+        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK)
+        {
+            unzClose((unzFile)m_Archive);
+            m_Archive = NULL;
+            break;
+        }
+    }
+
+    return match;
+}
+
+
+
+#endif
+      //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM