fixed relative filenames inside ZIP archive

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index fd0024f5c9699b4b9957933993ff3ab011b281ff..4d9d3aa3c5ae346c25b8e5decb315038cd7480fc 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -39,9 +39,9 @@
 #endif
 
 
 #endif
 
 

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

 // wxZipFSHandler
 // wxZipFSHandler

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

 
 
 
 
 
 


@@ -87,6 +87,14 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
         return NULL;
     }
 
         return NULL;
     }
 

+    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);
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 
     wxFileName leftFilename = wxFileSystem::URLToFileName(left);