some != NULL checks

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 56647fcd127e3e8a039999ac640c8bb1306b1f41..438a20a2b2ba0af47be987c5c6aec738f6faacfb 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -11,27 +11,29 @@
 #pragma implementation
 #endif
 
 #pragma implementation
 #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/wx.h"

 #endif
 
 #include "wx/filesys.h"
 #endif
 
 #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 +41,27 @@
 
 
 
 
 
 

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

 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") );

 }
 
 
 }
 
 


@@ -54,24 +73,109 @@ 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")) {

         return NULL;
     }
 
     s = new wxZipInputStream(left, right);
     if (s && (s -> LastError() == wxStream_NOERROR)) {
         return new wxFSFile(s,
         return NULL;
     }
 
     s = new wxZipInputStream(left, right);
     if (s && (s -> LastError() == wxStream_NOERROR)) {
         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;
 }
 
 
 
     }
     else 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")) {
+        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.fn_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;        
+        }
+    }
+    return DoFind();
+}
+
+
+
+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 fn, dir, name;
+    wxString match = wxEmptyString;
+    bool wasdir;
+
+    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.Last() == wxT('/')) {
+            fn.RemoveLast();
+            wasdir = TRUE;
+        }
+        else wasdir = FALSE;
+
+        name = fn.AfterLast(wxT('/'));
+        dir = fn.BeforeLast(wxT('/'));
+
+        if (dir == m_BaseDir) {
+            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;
+        }
+    }
+    
+    return match;
+}
+
+
+
+#endif 
+      //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM