From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 12 Apr 2003 22:28:51 +0000 (+0000)
Subject: fixed relative filenames inside ZIP archive
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ddaf55663fe1d17e473579e757a12473d3392b2c

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 fd0024f5c9..4d9d3aa3c5 100644
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -39,9 +39,9 @@
 #endif
 
 
-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 // wxZipFSHandler
-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 
 
 
@@ -87,6 +87,14 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
         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);