X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3f4609ebb56f76065c28352d8db37f65a6fa35e..e508567a95c7858f7bbf21d37c189fdd6f3eac2e:/src/common/fs_zip.cpp diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index 16da95be50..d2210718ce 100644 --- a/src/common/fs_zip.cpp +++ b/src/common/fs_zip.cpp @@ -4,43 +4,37 @@ // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik // CVS-ID: $Id$ -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #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 +#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM && wxUSE_ZLIB #ifndef WXPRECOMP -#include "wx/wx.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#include "wx/hash.h" #include "wx/filesys.h" +#include "wx/wfstream.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 - -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxZipFSHandler -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- @@ -48,7 +42,7 @@ 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; } @@ -56,18 +50,27 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler() wxZipFSHandler::~wxZipFSHandler() { - if (m_Archive) - unzClose((unzFile)m_Archive); + if (m_Archive) + CloseArchive(m_Archive); if (m_DirsFound) delete m_DirsFound; } +void wxZipFSHandler::CloseArchive(wxZipInputStream *archive) +{ + wxInputStream *stream = archive->GetFilterInputStream(); + delete archive; + delete stream; +} + + + bool wxZipFSHandler::CanOpen(const wxString& location) { wxString p = GetProtocol(location); - return (p == wxT("zip")) && + return (p == wxT("zip")) && (GetProtocol(GetLeftLocation(location)) == wxT("file")); } @@ -80,20 +83,35 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l 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; } - 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), - GetAnchor(location), - wxDateTime(wxFileModificationTime(left))); + GetAnchor(location) +#if wxUSE_DATETIME + , wxDateTime(wxFileModificationTime(left)) +#endif // wxUSE_DATETIME + ); } delete s; @@ -106,12 +124,12 @@ 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) + if (m_Archive) { - unzClose((unzFile)m_Archive); + CloseArchive(m_Archive); m_Archive = NULL; } @@ -121,37 +139,36 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags) 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_Archive = (void*) unzOpen(m_ZipFile.mb_str()); + wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath(); + + wxFFileInputStream *fs = new wxFFileInputStream(nativename); + if (fs->Ok()) + m_Archive = new wxZipInputStream(*fs); + else + delete fs; + m_Pattern = right.AfterLast(wxT('/')); m_BaseDir = right.BeforeLast(wxT('/')); - if (m_Archive) + if (m_Archive) { - if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK) - { - unzClose((unzFile)m_Archive); - m_Archive = NULL; - } - else + if (m_AllowDirs) { - if (m_AllowDirs) - { - delete m_DirsFound; - m_DirsFound = new wxHashTableLong(); - } - return DoFind(); + delete m_DirsFound; + m_DirsFound = new wxZipFilenameHashMap(); } + return DoFind(); } return wxEmptyString; } @@ -168,34 +185,36 @@ wxString wxZipFSHandler::FindNext() 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; + wxZipEntry *entry = m_Archive->GetNextEntry(); + if (!entry) + { + CloseArchive(m_Archive); + m_Archive = NULL; + break; + } + namestr = entry->GetName(wxPATH_UNIX); + delete entry; 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]; - if (m_DirsFound->Get(key) == wxNOT_FOUND) + if( m_DirsFound->find(dir) == m_DirsFound->end() ) { - m_DirsFound->Put(key, 1); + (*m_DirsFound)[dir] = 1; filename = dir.AfterLast(wxT('/')); dir = dir.BeforeLast(wxT('/')); if (!filename.IsEmpty() && m_BaseDir == dir && - wxMatchWild(m_Pattern, filename, FALSE)) + wxMatchWild(m_Pattern, filename, false)) match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename; } - else + else break; // already tranversed } } @@ -203,21 +222,14 @@ wxString wxZipFSHandler::DoFind() filename = namestr.AfterLast(wxT('/')); dir = namestr.BeforeLast(wxT('/')); if (m_AllowFiles && !filename.IsEmpty() && m_BaseDir == dir && - wxMatchWild(m_Pattern, filename, FALSE)) + 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 +#endif //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM