X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..901abd5953ad228319e918cab9e4e75580114cf8:/src/common/filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 54c8cc86e3..65fe27f61e 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -1,246 +1,401 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filesys.cpp
+// Name:        src/common/filesys.cpp
 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// CVS-ID:      $Id$
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop
 #endif
 
-#if !wxUSE_SOCKETS
-    #undef wxUSE_FS_INET
-    #define wxUSE_FS_INET 0
-#endif
 
-#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM
 
-#include "wx/wfstream.h"
-#include "wx/module.h"
 #include "wx/filesys.h"
 
-//--------------------------------------------------------------------------------
-// wxFileSystemHandler
-//--------------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/module.h"
+#endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
+#include "wx/sysopt.h"
+#include "wx/wfstream.h"
+#include "wx/mimetype.h"
+#include "wx/filename.h"
+#include "wx/tokenzr.h"
+#include "wx/uri.h"
+#include "wx/private/fileback.h"
 
-wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL;
+// ----------------------------------------------------------------------------
+// wxFSFile
+// ----------------------------------------------------------------------------
 
-void wxFileSystemHandler::CleanUpStatics()
+const wxString& wxFSFile::GetMimeType() const
 {
-    if (m_MimeMng) delete m_MimeMng;
-    m_MimeMng = NULL;
+    if ( m_MimeType.empty() && !m_Location.empty() )
+    {
+        wxConstCast(this, wxFSFile)->m_MimeType =
+            wxFileSystemHandler::GetMimeTypeFromExt(m_Location);
+    }
+
+    return m_MimeType;
 }
 
+// ----------------------------------------------------------------------------
+// wxFileSystemHandler
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
+
 
+/* static */
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
-    wxString ext = wxEmptyString, mime = wxEmptyString;
+    wxString ext, mime;
     wxString loc = GetRightLocation(location);
-    char c;
-    int l = loc.Length(), l2;
-    wxFileType *ft;
+    wxChar c;
+    int l = loc.length(), l2;
 
     l2 = l;
-    for (int i = l-1; i >= 0; i--) {
+    for (int i = l-1; i >= 0; i--)
+    {
         c = loc[(unsigned int) i];
-        if (c == T('#')) l2 = i + 1;
-        if (c == T('.')) {ext = loc.Right(l2-i-1); break;}
-        if ((c == T('/')) || (c == T('\\')) || (c == T(':'))) {return wxEmptyString;}
+        if ( c == wxT('#') )
+            l2 = i + 1;
+        if ( c == wxT('.') )
+        {
+            ext = loc.Right(l2-i-1);
+            break;
+        }
+        if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) )
+            return wxEmptyString;
     }
 
-    if (m_MimeMng == NULL) {
-        m_MimeMng = new wxMimeTypesManager;
+#if wxUSE_MIMETYPE
+    static bool s_MinimalMimeEnsured = false;
 
-        static const wxFileTypeInfo fallbacks[] =
+    // Don't use mime types manager if the application doesn't need it and it would be
+    // cause an unacceptable delay, especially on startup.
+#if wxUSE_SYSTEM_OPTIONS
+    if ( !wxSystemOptions::GetOptionInt(wxT("filesys.no-mimetypesmanager")) )
+#endif
+    {
+        if (!s_MinimalMimeEnsured)
         {
-            wxFileTypeInfo("image/jpeg",
-                           "",
-                           "",
-                           "JPEG image (from fallback)",
-                           "jpg", "jpeg", NULL),
-            wxFileTypeInfo("image/gif",
-                           "",
-                           "",
-                           "GIF image (from fallback)",
-                           "gif", NULL),
-            wxFileTypeInfo("image/png",
-                           "",
-                           "",
-                           "PNG image (from fallback)",
-                           "png", NULL),
-            wxFileTypeInfo("image/bmp",
-                           "",
-                           "",
-                           "windows bitmap image (from fallback)",
-                           "bmp", NULL),
-            wxFileTypeInfo("text/html",
-                           "",
-                           "",
-                           "HTML document (from fallback)",
-                           "htm", "html", NULL),
-
-            // must terminate the table with this!
-            wxFileTypeInfo()
-        };
-
-        m_MimeMng -> AddFallbacks(fallbacks);
-    }
+            static const wxFileTypeInfo fallbacks[] =
+            {
+                wxFileTypeInfo(wxT("image/jpeg"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    wxT("JPEG image (from fallback)"),
+                    wxT("jpg"), wxT("jpeg"), wxT("JPG"), wxT("JPEG"), wxNullPtr),
+                wxFileTypeInfo(wxT("image/gif"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    wxT("GIF image (from fallback)"),
+                    wxT("gif"), wxT("GIF"), wxNullPtr),
+                wxFileTypeInfo(wxT("image/png"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    wxT("PNG image (from fallback)"),
+                    wxT("png"), wxT("PNG"), wxNullPtr),
+                wxFileTypeInfo(wxT("image/bmp"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    wxT("windows bitmap image (from fallback)"),
+                    wxT("bmp"), wxT("BMP"), wxNullPtr),
+                wxFileTypeInfo(wxT("text/html"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    wxT("HTML document (from fallback)"),
+                    wxT("htm"), wxT("html"), wxT("HTM"), wxT("HTML"), wxNullPtr),
+                // must terminate the table with this!
+                wxFileTypeInfo()
+            };
+            wxTheMimeTypesManager->AddFallbacks(fallbacks);
+            s_MinimalMimeEnsured = true;
+        }
 
-    ft = m_MimeMng -> GetFileTypeFromExtension(ext);
-    if (ft && (ft -> GetMimeType(&mime))) return mime;
-    else return wxEmptyString;
+        wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+        if ( !ft || !ft -> GetMimeType(&mime) )
+        {
+            mime = wxEmptyString;
+        }
+
+        delete ft;
+
+        return mime;
+    }
+    else
+#endif
+    {
+        if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) )
+            return wxT("text/html");
+        if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) )
+            return wxT("image/jpeg");
+        if ( ext.IsSameAs(wxT("gif"), false) )
+            return wxT("image/gif");
+        if ( ext.IsSameAs(wxT("png"), false) )
+            return wxT("image/png");
+        if ( ext.IsSameAs(wxT("bmp"), false) )
+            return wxT("image/bmp");
+        return wxEmptyString;
+    }
 }
 
 
 
-wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetProtocol(const wxString& location)
 {
     wxString s = wxEmptyString;
-    int i, l = location.Length();
-    bool fnd;
+    int i, l = location.length();
+    bool fnd = false;
 
-    fnd = FALSE;
-    for (i = l-1; (i >= 0) && ((location[i] != T('#')) || (!fnd)); i--) {
-        if ((location[i] == T(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+    for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
     }
-    if (!fnd) return T("file");
-    for (++i; (i < l) && (location[i] != T(':')); i++) s << location[i];
+    if (!fnd) return wxT("file");
+    for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];
     return s;
 }
 
 
-wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetLeftLocation(const wxString& location)
 {
     int i;
-    bool fnd;
+    bool fnd = false;
 
-    fnd = FALSE;
-    for (i = location.Length()-1; i >= 0; i--) {
-        if ((location[i] == T(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
-        else if (fnd && (location[i] == T('#'))) return location.Left(i);
+    for (i = location.length()-1; i >= 0; i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
+        else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
     }
     return wxEmptyString;
 }
 
-wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetRightLocation(const wxString& location)
 {
-    int i, l = location.Length();
+    int i, l = location.length();
     int l2 = l + 1;
-    for (i = l-1; (i >= 0) && ((location[i] != T(':')) || (i == 1) || (location[i-2] == T(':'))); i--) {if (location[i] == T('#')) 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);
 }
 
-wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetAnchor(const wxString& location)
 {
-    char c;
-    int l = location.Length();
+    wxChar c;
+    int l = location.length();
 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];
-        if (c == T('#')) return location.Right(l-i-1);
-        else if ((c == T('.')) || (c == T('/')) || (c == T('\\')) || (c == T(':'))) return wxEmptyString;
+        if (c == wxT('#'))
+            return location.Right(l-i-1);
+        else if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')))
+            return wxEmptyString;
     }
     return wxEmptyString;
 }
 
+
+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                        int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}
+
+wxString wxFileSystemHandler::FindNext()
+{
+    return wxEmptyString;
+}
+
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 
-class wxLocalFSHandler : public wxFileSystemHandler
-{
-    public:
-        virtual bool CanOpen(const wxString& location);
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
-};
 
+wxString wxLocalFSHandler::ms_root;
 
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {
-    return GetProtocol(location) == T("file");
+    return GetProtocol(location) == wxT("file");
 }
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
+    // location has Unix path separators
     wxString right = GetRightLocation(location);
-    if (wxFileExists(right))
-        return new wxFSFile(new wxFileInputStream(right),
-                            right,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location));
-    else return (wxFSFile*) NULL;
+    wxFileName fn = wxFileSystem::URLToFileName(right);
+    wxString fullpath = ms_root + fn.GetFullPath();
+
+    if (!wxFileExists(fullpath))
+        return NULL;
+
+    // we need to check whether we can really read from this file, otherwise
+    // wxFSFile is not going to work
+#if wxUSE_FFILE
+    wxFFileInputStream *is = new wxFFileInputStream(fullpath);
+#elif wxUSE_FILE
+    wxFileInputStream *is = new wxFileInputStream(fullpath);
+#else
+#error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work
+#endif
+    if ( !is->Ok() )
+    {
+        delete is;
+        return NULL;
+    }
+
+    return new wxFSFile(is,
+                        right,
+                        wxEmptyString,
+                        GetAnchor(location)
+#if wxUSE_DATETIME
+                        ,wxDateTime(wxFileModificationTime(fullpath))
+#endif // wxUSE_DATETIME
+                        );
+}
+
+wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
+{
+    wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
+    const wxString found = wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
+    if ( found.empty() )
+        return found;
+    return wxFileSystem::FileNameToURL(found);
+}
+
+wxString wxLocalFSHandler::FindNext()
+{
+    const wxString found = wxFindNextFile();
+    if ( found.empty() )
+        return found;
+    return wxFileSystem::FileNameToURL(found);
 }
 
+
+
 //-----------------------------------------------------------------------------
 // wxFileSystem
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)
 
 
 wxList wxFileSystem::m_Handlers;
 
 
+wxFileSystem::~wxFileSystem()
+{
+    WX_CLEAR_HASH_MAP(wxFSHandlerHash, m_LocalHandlers)
+}
+
+
+static wxString MakeCorrectPath(const wxString& path)
+{
+    wxString p(path);
+    wxString r;
+    int i, j, cnt;
+
+    cnt = p.length();
+    for (i = 0; i < cnt; i++)
+      if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
+
+    if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }
+
+    if (cnt < 3) return p;
+
+    r << p.GetChar(0) << p.GetChar(1);
+
+    // skip trailing ../.., if any
+    for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i);
+
+    // remove back references: translate dir1/../dir2 to dir2
+    for (; i < cnt; i++)
+    {
+        r << p.GetChar(i);
+        if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
+        {
+            for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+            if (j >= 0 && r.GetChar(j) != wxT(':'))
+            {
+                for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+                r.Remove(j + 1);
+            }
+        }
+    }
+
+    for (; i < cnt; i++) r << p.GetChar(i);
+
+    return r;
+}
+
 
 void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 {
     int i, pathpos = -1;
-    m_Path = location;
 
-    for (i = m_Path.Length()-1; i >= 0; i--)
-        if (m_Path[(unsigned int) i] == T('\\')) m_Path.GetWritableChar(i) = T('/');         // wanna be windows-safe
+    m_Path = MakeCorrectPath(location);
 
-    if (is_dir == FALSE)
+    if (is_dir)
     {
-        for (i = m_Path.Length()-1; i >= 0; i--)
-	{
-            if (m_Path[(unsigned int) i] == T('/'))
-	    {
-                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == T('/')) && (m_Path[(unsigned int) (i-2)] == T(':')))
-		{
+        if (m_Path.length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
+            m_Path << wxT('/');
+    }
+
+    else
+    {
+        for (i = m_Path.length()-1; i >= 0; i--)
+        {
+            if (m_Path[(unsigned int) i] == wxT('/'))
+            {
+                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
+                {
                     i -= 2;
                     continue;
                 }
                 else
-		{
+                {
                     pathpos = i;
                     break;
                 }
             }
-        else if (m_Path[(unsigned int) i] == T(':')) {
-            pathpos = i;
-        break;
+            else if (m_Path[(unsigned int) i] == wxT(':')) {
+                pathpos = i;
+                break;
+            }
         }
-    }
         if (pathpos == -1)
-	{
-            for (i = 0; i < (int) m_Path.Length(); i++)
-	    {
-                if (m_Path[(unsigned int) i] == T(':'))
-		{
-                    //m_Path << T('/');
+        {
+            for (i = 0; i < (int) m_Path.length(); i++)
+            {
+                if (m_Path[(unsigned int) i] == wxT(':'))
+                {
                     m_Path.Remove(i+1);
                     break;
                 }
             }
-            if (i == (int) m_Path.Length())
-	        m_Path = wxEmptyString;
+            if (i == (int) m_Path.length())
+                m_Path = wxEmptyString;
         }
         else
-	{
-            if (m_Path[m_Path.Length()-1] != T('/'))
-	        m_Path << T('/');
+        {
             m_Path.Remove(pathpos+1);
         }
     }
@@ -248,37 +403,61 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 
 
 
-wxFSFile* wxFileSystem::OpenFile(const wxString& location)
+wxFileSystemHandler *wxFileSystem::MakeLocal(wxFileSystemHandler *h)
 {
-    wxString loc = location;
-    int i, ln;
-    char meta;
+    wxClassInfo *classinfo = h->GetClassInfo();
+
+    if (classinfo->IsDynamic())
+    {
+        wxFileSystemHandler*& local = m_LocalHandlers[classinfo];
+        if (!local)
+            local = (wxFileSystemHandler*)classinfo->CreateObject();
+        return local;
+    }
+    else
+    {
+        return h;
+    }
+}
+
+
+
+wxFSFile* wxFileSystem::OpenFile(const wxString& location, int flags)
+{
+    if ((flags & wxFS_READ) == 0)
+        return NULL;
+
+    wxString loc = MakeCorrectPath(location);
+    unsigned i, ln;
+    wxChar meta;
     wxFSFile *s = NULL;
-    wxNode *node;
+    wxList::compatibility_iterator node;
 
-    ln = loc.Length();
+    ln = loc.length();
     meta = 0;
     for (i = 0; i < ln; i++)
     {
-        if (loc[(unsigned int) i] == T('\\')) loc.GetWritableChar(i) = T('/');         // wanna be windows-safe
-        if (!meta) switch (loc[(unsigned int) i])
-	{
-            case T('/') : case T(':') : case T('#') : meta = loc[(unsigned int) i];
+        switch ( loc[i].GetValue() )
+        {
+            case wxT('/') : case wxT(':') : case wxT('#') :
+                meta = loc[i];
+                break;
         }
+        if (meta != 0) break;
     }
     m_LastName = wxEmptyString;
 
     // try relative paths first :
-    if (meta != T(':'))
+    if (meta != wxT(':'))
     {
         node = m_Handlers.GetFirst();
         while (node)
-	{
+        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
-            if (h->CanOpen(m_Path + location))
-	    {
-                s = h->OpenFile(*this, m_Path + location);
-                if (s) { m_LastName = m_Path + location; break; }
+            if (h->CanOpen(m_Path + loc))
+            {
+                s = MakeLocal(h)->OpenFile(*this, m_Path + loc);
+                if (s) { m_LastName = m_Path + loc; break; }
             }
             node = node->GetNext();
         }
@@ -289,30 +468,258 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
-	{
+        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
-            if (h->CanOpen(location))
-	    {
-                s = h->OpenFile(*this, location);
-                if (s) { m_LastName = location; break; }
+            if (h->CanOpen(loc))
+            {
+                s = MakeLocal(h)->OpenFile(*this, loc);
+                if (s) { m_LastName = loc; break; }
             }
             node = node->GetNext();
         }
     }
+
+    if (s && (flags & wxFS_SEEKABLE) != 0 && !s->GetStream()->IsSeekable())
+    {
+        wxBackedInputStream *stream;
+        stream = new wxBackedInputStream(s->DetachStream());
+        stream->FindLength();
+        s->SetStream(stream);
+    }
+
     return (s);
 }
 
 
+
+wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
+{
+    wxList::compatibility_iterator node;
+    wxString spec2(spec);
+
+    m_FindFileHandler = NULL;
+
+    for (int i = spec2.length()-1; i >= 0; i--)
+        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
+        if (h -> CanOpen(m_Path + spec2))
+        {
+            m_FindFileHandler = MakeLocal(h);
+            return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
+        }
+        node = node->GetNext();
+    }
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
+        if (h -> CanOpen(spec2))
+        {
+            m_FindFileHandler = MakeLocal(h);
+            return m_FindFileHandler -> FindFirst(spec2, flags);
+        }
+        node = node->GetNext();
+    }
+
+    return wxEmptyString;
+}
+
+
+
+wxString wxFileSystem::FindNext()
+{
+    if (m_FindFileHandler == NULL) return wxEmptyString;
+    else return m_FindFileHandler -> FindNext();
+}
+
+bool wxFileSystem::FindFileInPath(wxString *pStr,
+                                  const wxString& path,
+                                  const wxString& basename)
+{
+    // we assume that it's not empty
+    wxCHECK_MSG( !basename.empty(), false,
+                wxT("empty file name in wxFileSystem::FindFileInPath"));
+
+    wxString name;
+    // skip path separator in the beginning of the file name if present
+    if ( wxIsPathSeparator(basename[0u]) )
+        name = basename.substr(1);
+    else
+        name = basename;
+
+    wxStringTokenizer tokenizer(path, wxPATH_SEP);
+    while ( tokenizer.HasMoreTokens() )
+    {
+        wxString strFile = tokenizer.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += name;
+
+        wxFSFile *file = OpenFile(strFile);
+        if ( file )
+        {
+            delete file;
+            *pStr = strFile;
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {
-    m_Handlers.Append(handler);
+    // prepend the handler to the beginning of the list because handlers added
+    // last should have the highest priority to allow overriding them
+    m_Handlers.Insert((size_t)0, handler);
+}
+
+wxFileSystemHandler* wxFileSystem::RemoveHandler(wxFileSystemHandler *handler)
+{
+    // if handler has already been removed (or deleted)
+    // we return NULL. This is by design in case
+    // CleanUpHandlers() is called before RemoveHandler
+    // is called, as we cannot control the order
+    // which modules are unloaded
+    if (!m_Handlers.DeleteObject(handler))
+        return NULL;
+
+    return handler;
 }
 
 
+bool wxFileSystem::HasHandlerForPath(const wxString &location)
+{
+    for ( wxList::compatibility_iterator node = m_Handlers.GetFirst();
+           node; node = node->GetNext() )
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
+        if (h->CanOpen(location))
+            return true;
+    }
+
+    return false;
+}
+
 void wxFileSystem::CleanUpHandlers()
 {
-    m_Handlers.DeleteContents(TRUE);
-    m_Handlers.Clear();
+    WX_CLEAR_LIST(wxList, m_Handlers);
+}
+
+static const wxString g_unixPathString(wxT("/"));
+static const wxString g_nativePathString(wxFILE_SEP_PATH);
+
+// Returns the native path for a file URL
+wxFileName wxFileSystem::URLToFileName(const wxString& url)
+{
+    wxString path = url;
+
+    if ( path.Find(wxT("file://")) == 0 )
+    {
+        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 = wxURI::Unescape(path);
+
+#ifdef __WXMSW__
+    // file urls either start with a forward slash (local harddisk),
+    // otherwise they have a servername/sharename notation,
+    // which only exists on msw and corresponds to a unc
+    if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
+    {
+        path = path.Mid(1);
+    }
+    else if ( (url.Find(wxT("file://")) == 0) &&
+              (path.Find(wxT('/')) != wxNOT_FOUND) &&
+              (path.length() > 1) && (path[1u] != wxT(':')) )
+    {
+        path = wxT("//") + path;
+    }
+#endif
+
+    path.Replace(g_unixPathString, g_nativePathString);
+
+    return wxFileName(path, wxPATH_NATIVE);
+}
+
+// Escapes non-ASCII and others characters in file: URL to be valid URLs
+static wxString EscapeFileNameCharsInURL(const char *in)
+{
+    wxString s;
+
+    for ( const unsigned char *p = (const unsigned char*)in; *p; ++p )
+    {
+        const unsigned char c = *p;
+
+        // notice that all colons *must* be encoded in the paths used by
+        // wxFileSystem even though this makes URLs produced by this method
+        // unusable with IE under Windows as it requires "file:///c:/foo.bar"
+        // and doesn't accept "file:///c%3a/foo.bar" -- but then we never made
+        // any guarantees about general suitability of the strings returned by
+        // this method, they must work with wxFileSystem only and not encoding
+        // the colon breaks handling of
+        // "http://wherever/whatever.zip#zip:filename.ext" URLs so we really
+        // can't do this without heavy changes to the parsing code here, in
+        // particular in GetRightLocation()
+
+        if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' ||
+             (c >= '0' && c <= '9') ||
+             (c >= 'a' && c <= 'z') ||
+             (c >= 'A' && c <= 'Z') )
+        {
+            s << c;
+        }
+        else
+        {
+            s << wxString::Format("%%%02x", c);
+        }
+    }
+
+    return s;
+}
+
+// Returns the file URL for a native path
+wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
+{
+    wxFileName fn = filename;
+    fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE);
+    wxString url = fn.GetFullPath(wxPATH_NATIVE);
+
+#ifndef __UNIX__
+    // unc notation, wxMSW
+    if ( url.Find(wxT("\\\\")) == 0 )
+    {
+        url = wxT("//") + url.Mid(2);
+    }
+    else
+    {
+        url = wxT("/") + url;
+#ifdef __WXMAC__
+        url = wxT("/") + url;
+#endif
+
+    }
+#endif
+
+    url.Replace(g_nativePathString, g_unixPathString);
+
+    // Do wxURI- and common practice-compatible escaping: encode the string
+    // into UTF-8, then escape anything non-ASCII:
+    return wxT("file:") + EscapeFileNameCharsInURL(url.utf8_str());
 }
 
 
@@ -323,22 +730,31 @@ class wxFileSystemModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
 
     public:
+        wxFileSystemModule() :
+            wxModule(),
+            m_handler(NULL)
+        {
+        }
+
         virtual bool OnInit()
         {
-            wxFileSystem::AddHandler(new wxLocalFSHandler);
-            return TRUE;
+            m_handler = new wxLocalFSHandler;
+            wxFileSystem::AddHandler(m_handler);
+            return true;
         }
         virtual void OnExit()
-	{
-	    wxFileSystemHandler::CleanUpStatics();
+        {
+            delete wxFileSystem::RemoveHandler(m_handler);
+
             wxFileSystem::CleanUpHandlers();
-	}
+        }
+
+    private:
+        wxFileSystemHandler* m_handler;
+
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif
-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
-
-
-
+  // wxUSE_FILESYSTEM