ensure minimal mime support in wxHTML even without wxMimeTypesMananger

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 16da95be508af4b3ffba1627ef82f836a4f7c221..97cfa0bb1b9da6c8dbf57fbe81e4d2944f818256 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -22,7 +22,8 @@
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
 
 #ifndef WXPRECOMP
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
 
 #ifndef WXPRECOMP

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

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


@@ -56,7 +57,7 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 
 wxZipFSHandler::~wxZipFSHandler()
 {
 
 wxZipFSHandler::~wxZipFSHandler()
 {

-    if (m_Archive)         
+    if (m_Archive)

         unzClose((unzFile)m_Archive);
     if (m_DirsFound)
         delete m_DirsFound;
         unzClose((unzFile)m_Archive);
     if (m_DirsFound)
         delete m_DirsFound;


@@ -67,7 +68,7 @@ wxZipFSHandler::~wxZipFSHandler()
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    return (p == wxT("zip")) && 
+    return (p == wxT("zip")) &&

            (GetProtocol(GetLeftLocation(location)) == wxT("file"));
 }
 
            (GetProtocol(GetLeftLocation(location)) == wxT("file"));
 }
 


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

-    if (GetProtocol(left) != wxT("file")) 
+    if (GetProtocol(left) != wxT("file"))

     {
         wxLogError(_("ZIP handler currently supports only local files!"));
         return NULL;
     }
 
     {
         wxLogError(_("ZIP handler currently supports only local files!"));
         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,
                             left + wxT("#zip:") + right,
     {
         return new wxFSFile(s,
                             left + wxT("#zip:") + right,


@@ -106,10 +109,10 @@ 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.Last() == wxT('/')) right.RemoveLast();
 

-    if (m_Archive) 
+    if (m_Archive)

     {
         unzClose((unzFile)m_Archive);
         m_Archive = NULL;
     {
         unzClose((unzFile)m_Archive);
         m_Archive = NULL;


@@ -121,13 +124,13 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
         return wxEmptyString;
     }
 
         return wxEmptyString;
     }
 

-    switch (flags) 
+    switch (flags)

     {
     {

-        case wxFILE: 
+        case wxFILE:

             m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;
             m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;

-        case wxDIR: 
+        case wxDIR:

             m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;
             m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;

-        default: 
+        default:

             m_AllowDirs = m_AllowFiles = TRUE; break;
     }
 
             m_AllowDirs = m_AllowFiles = TRUE; break;
     }
 


@@ -136,14 +139,14 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 

-    if (m_Archive) 
+    if (m_Archive)

     {
     {

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

         {
             unzClose((unzFile)m_Archive);
         {
             unzClose((unzFile)m_Archive);

-            m_Archive = NULL;        
+            m_Archive = NULL;

         }
         }

-        else 
+        else

         {
             if (m_AllowDirs)
             {
         {
             if (m_AllowDirs)
             {


@@ -181,7 +184,7 @@ wxString wxZipFSHandler::DoFind()
 
         if (m_AllowDirs)
         {
 
         if (m_AllowDirs)
         {

-            dir = namestr.BeforeLast(wxT('/'));       
+            dir = namestr.BeforeLast(wxT('/'));

             while (!dir.IsEmpty())
             {
                 long key = 0;
             while (!dir.IsEmpty())
             {
                 long key = 0;


@@ -195,7 +198,7 @@ wxString wxZipFSHandler::DoFind()
                                 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;
                 }

-                else 
+                else

                     break; // already tranversed
             }
         }
                     break; // already tranversed
             }
         }


@@ -205,19 +208,19 @@ wxString wxZipFSHandler::DoFind()
         if (m_AllowFiles && !filename.IsEmpty() && m_BaseDir == dir &&
                             wxMatchWild(m_Pattern, filename, FALSE))
             match = m_ZipFile + wxT("#zip:") + namestr;
         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) 
+
+        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK)

         {
             unzClose((unzFile)m_Archive);
             m_Archive = NULL;
             break;
         }
     }
         {
             unzClose((unzFile)m_Archive);
             m_Archive = NULL;
             break;
         }
     }

-    
+

     return match;
 }
 
 
 
     return match;
 }
 
 
 

-#endif 
+#endif

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