Fixed Digital Mars compilation; Cosmetic cleanup.

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 16da95be508af4b3ffba1627ef82f836a4f7c221..bb449aab85aaf358a9afbdba6819ba4769eddad6 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -9,23 +9,24 @@
 
 
 
 
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "fs_zip.h"
 #endif
 
 #include "wx/wxprec.h"
 
 #pragma implementation "fs_zip.h"
 #endif
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
 
 #ifndef WXPRECOMP
 #pragma hdrstop
 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
 
 #ifndef WXPRECOMP

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

 #endif
 
 #endif
 

-#include "wx/hash.h"
+#include "wx/hashmap.h"

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


@@ -37,10 +38,12 @@
 #include "unzip.h"
 #endif
 
 #include "unzip.h"
 #endif
 

+WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
+                               wxLongToLongHashMap, class WXDLLIMPEXP_BASE );

 
 

-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------

 // wxZipFSHandler
 // wxZipFSHandler

-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------

 
 
 
 
 
 


@@ -56,7 +59,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 +70,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,20 +83,35 @@ 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;
     }
 

-    s = new wxZipInputStream(left, right);
-    if (s && (s->LastError() == wxStream_NOERROR)) 
+    if (right.Contains(wxT("./")))
+    {
+        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);
+    }
+    
+    if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
+
+    wxFileName leftFilename = wxFileSystem::URLToFileName(left);
+
+    s = new wxZipInputStream(leftFilename.GetFullPath(), right);
+    if (s && s->IsOk() )

     {
         return new wxFSFile(s,
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
     {
         return new wxFSFile(s,
                             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;


@@ -106,10 +124,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,34 +139,35 @@ 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_ZipFile = left;
             m_AllowDirs = m_AllowFiles = TRUE; break;
     }
 
     m_ZipFile = left;

-    m_Archive = (void*) unzOpen(m_ZipFile.mb_str());
+    wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
+    m_Archive = (void*) unzOpen(nativename.mb_str());

     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)
             {
                 delete m_DirsFound;
         {
             if (m_AllowDirs)
             {
                 delete m_DirsFound;

-                m_DirsFound = new wxHashTableLong();
+                m_DirsFound = new wxLongToLongHashMap();

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


@@ -176,26 +195,27 @@ wxString wxZipFSHandler::DoFind()
     while (match == wxEmptyString)
     {
         unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0);
     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;
+        for (c = namebuf; *c; c++) if (*c == '\\') *c = '/';
+        namestr = wxString::FromAscii( namebuf );    // TODO what encoding does ZIP use?

 
         if (m_AllowDirs)
         {
 
         if (m_AllowDirs)
         {

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

             while (!dir.IsEmpty())
             {
                 long key = 0;
                 for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
             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)
+                wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
+                if (it == m_DirsFound->end())

                 {
                 {

-                    m_DirsFound->Put(key, 1);
+                    (*m_DirsFound)[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;
                 }
                     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 
+                else

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


@@ -205,19 +225,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