X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..f2593d0ddae43a3e9054d2e9bb59646e19dffe73:/src/common/filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 65dfccc567..182465c6a1 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -97,8 +97,14 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
     }
 
     ft = m_MimeMng -> GetFileTypeFromExtension(ext);
-    if (ft && (ft -> GetMimeType(&mime))) return mime;
-    else return wxEmptyString;
+    if (ft && (ft -> GetMimeType(&mime))) {
+        delete ft; 
+        return mime;
+    }
+    else {
+        delete ft;
+        return wxEmptyString;
+    }
 }
 
 
@@ -154,6 +160,18 @@ wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
     return wxEmptyString;
 }
 
+
+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                        int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}
+
+wxString wxFileSystemHandler::FindNext()
+{
+    return wxEmptyString;
+}
+
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
@@ -163,6 +181,8 @@ class wxLocalFSHandler : public wxFileSystemHandler
     public:
         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+        virtual wxString FindFirst(const wxString& spec, int flags = 0);
+        virtual wxString FindNext();
 };
 
 
@@ -182,6 +202,19 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     else return (wxFSFile*) NULL;
 }
 
+wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
+{
+    wxString right = GetRightLocation(spec);
+    return wxFindFirstFile(right, flags);
+}
+
+wxString wxLocalFSHandler::FindNext()
+{
+    return wxFindNextFile();
+}
+
+
+
 //-----------------------------------------------------------------------------
 // wxFileSystem
 //-----------------------------------------------------------------------------
@@ -201,46 +234,49 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     for (i = m_Path.Length()-1; i >= 0; i--)
         if (m_Path[(unsigned int) i] == wxT('\\')) m_Path.GetWritableChar(i) = wxT('/');         // wanna be windows-safe
 
-    if (is_dir == FALSE)
+    if (is_dir)
+    {
+        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] == wxT(':')) {
-            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] == wxT(':'))
-		{
-                    //m_Path << wxT('/');
+        		{
                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())
-	        m_Path = wxEmptyString;
+    	        m_Path = wxEmptyString;
         }
         else
-	{
-            if (m_Path[m_Path.Length()-1] != wxT('/'))
-	        m_Path << wxT('/');
+    	{
             m_Path.Remove(pathpos+1);
         }
     }
@@ -261,10 +297,11 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     for (i = 0; i < ln; i++)
     {
         if (loc[(unsigned int) i] == wxT('\\')) loc.GetWritableChar(i) = wxT('/');         // wanna be windows-safe
-        if (!meta) switch (loc[(unsigned int) i])
-	{
-            case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[(unsigned int) i];
-        }
+        if (!meta) 
+            switch (loc[(unsigned int) i])
+        	{
+                case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[(unsigned int) i];
+            }
     }
     m_LastName = wxEmptyString;
 
@@ -273,12 +310,12 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         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 = h->OpenFile(*this, m_Path + loc);
+                if (s) { m_LastName = m_Path + loc; break; }
             }
             node = node->GetNext();
         }
@@ -289,12 +326,12 @@ 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 = h->OpenFile(*this, loc);
+                if (s) { m_LastName = loc; break; }
             }
             node = node->GetNext();
         }
@@ -303,6 +340,48 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 }
 
 
+
+wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
+{
+    wxNode *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('/'); // wanna be windows-safe
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
+        if (m_FindFileHandler -> CanOpen(m_Path + spec2)) 
+            return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
+        node = node->GetNext();
+    } 
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
+        if (m_FindFileHandler -> CanOpen(spec2))
+            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();
+}
+
+
+
 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {
     m_Handlers.Append(handler);
@@ -316,6 +395,8 @@ void wxFileSystem::CleanUpHandlers()
 }
 
 
+
+
 ///// Module:
 
 class wxFileSystemModule : public wxModule
@@ -329,10 +410,10 @@ class wxFileSystemModule : public wxModule
             return TRUE;
         }
         virtual void OnExit()
-	{
-	    wxFileSystemHandler::CleanUpStatics();
+    	{
+    	    wxFileSystemHandler::CleanUpStatics();
             wxFileSystem::CleanUpHandlers();
-	}
+    	}
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)