X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ad944dcbcb8c1aaa0b8b5ce653d5a7206ea7cb8..30fd71e65bbbada8d17a0efbafbbbb3bafb42f9f:/src/common/filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index fa5355435d..c1e3070423 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -25,7 +25,7 @@
 #include "wx/filesys.h"
 #include "wx/mimetype.h"
 #include "wx/filename.h"
-
+#include "wx/log.h"
 
 
 //--------------------------------------------------------------------------------
@@ -127,7 +127,14 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
     int i, l = location.Length();
     int l2 = l + 1;
-    for (i = l-1; (i >= 0) && ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) {if (location[i] == wxT('#')) l2 = i + 1;}
+
+    for (i = l-1; 
+         (i >= 0) && 
+         ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));
+         i--)
+    {
+        if (location[i] == wxT('#')) l2 = i + 1;
+    }
     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }
@@ -172,25 +179,27 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     // location has Unix path separators
-    wxString right = ms_root + GetRightLocation(location);
+    wxString right = GetRightLocation(location);
     wxFileName fn = wxFileSystem::URLToFileName(right);
+    wxString fullpath = ms_root + fn.GetFullPath();
 
-    if (!wxFileExists(fn.GetFullPath()))
+    if (!wxFileExists(fullpath))
         return (wxFSFile*) NULL;
 
-    return new wxFSFile(new wxFFileInputStream(fn.GetFullPath()),
+    return new wxFSFile(new wxFFileInputStream(fullpath),
                         right,
                         GetMimeTypeFromExt(location),
-                        GetAnchor(location),
-                        wxDateTime(wxFileModificationTime(fn.GetFullPath())));
-
+                        GetAnchor(location)
+#if wxUSE_DATETIME
+                        ,wxDateTime(wxFileModificationTime(fullpath))
+#endif // wxUSE_DATETIME
+                        );
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {
-    wxString right = ms_root + GetRightLocation(spec);
-    return wxFindFirstFile(wxFileSystem::URLToFileName(right).GetFullPath(),
-                           flags);
+    wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
+    return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
 }
 
 wxString wxLocalFSHandler::FindNext()
@@ -313,7 +322,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     unsigned i, ln;
     char meta;
     wxFSFile *s = NULL;
-    wxNode *node;
+    wxList::compatibility_iterator node;
 
     ln = loc.Length();
     meta = 0;
@@ -367,7 +376,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
 wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
-    wxNode *node;
+    wxList::compatibility_iterator node;
     wxString spec2(spec);
 
     m_FindFileHandler = NULL;
@@ -414,8 +423,7 @@ void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 
 void wxFileSystem::CleanUpHandlers()
 {
-    m_Handlers.DeleteContents(TRUE);
-    m_Handlers.Clear();
+    WX_CLEAR_LIST(wxList, m_Handlers);
 }
 
 const static wxString g_unixPathString(wxT("/"));
@@ -430,6 +438,18 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url)
 	{
 		path = path.Mid(7);
 	}
+    else if ( path.Find(wxT("file:")) == 0 )
+	{
+		path = path.Mid(5);
+	}
+	// Remove preceding double slash on Mac Classic
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    else if ( path.Find(wxT("//")) == 0 )
+        path = path.Mid(2);
+#endif
+    
+    path.Replace(wxT("%25"), wxT("%"));
+    path.Replace(wxT("%3A"), wxT(":"));
 
 #ifdef __WXMSW__
 	// file urls either start with a forward slash (local harddisk),
@@ -459,8 +479,8 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
     fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE);
     wxString url = fn.GetFullPath(wxPATH_NATIVE);
 
-#ifdef __WXMSW__
-    // unc notation
+#ifndef __UNIX__
+    // unc notation, wxMSW
     if ( url.Find(wxT("\\\\")) == 0 ) 
     {
         url = url.Mid(2);
@@ -468,11 +488,17 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
     else
     {
         url = wxT("/") + url;
+#ifdef __WXMAC__
+        url = wxT("/") + url;
+#endif
+
     }
 #endif
 
     url.Replace(g_nativePathString, g_unixPathString);
-    url = wxT("file://") + url;
+    url.Replace(wxT("%"), wxT("%25"));
+    url.Replace(wxT(":"), wxT("%3A"));
+    url = wxT("file:") + url;
     return url;
 }