minor fix that was part of helpbest.patch

[wxWidgets.git] / src / common / filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 9925521aa3070c818297c818a13568d90462d266..8509d41a021bb3ccda2a40d63df1bb66a5f4b860 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -24,7 +24,7 @@
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"

-
+#include "wx/filename.h"

 
 
 
 
 
 


@@ -155,15 +155,18 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {

+    // location has Unix path separators

     wxString right = GetRightLocation(location);
     wxString right = GetRightLocation(location);

-    if (!wxFileExists(right))
+    wxFileName fn( right, wxPATH_UNIX );
+    
+    if (!wxFileExists( fn.GetFullPath() ))

         return (wxFSFile*) NULL;
         return (wxFSFile*) NULL;

-
-    return new wxFSFile(new wxFileInputStream(right),
+        
+    return new wxFSFile(new wxFileInputStream( fn.GetFullPath() ),

                         right,
                         GetMimeTypeFromExt(location),
                         GetAnchor(location),
                         right,
                         GetMimeTypeFromExt(location),
                         GetAnchor(location),

-                        wxDateTime(wxFileModificationTime(right)));
+                        wxDateTime(wxFileModificationTime( fn.GetFullPath() )));

 
 }
 
 
 }
 


@@ -195,20 +198,20 @@ static wxString MakeCorrectPath(const wxString& path)
     wxString p(path);
     wxString r;
     int i, j, cnt;
     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
     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 (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }

-    
+

     if (cnt < 3) return p;
     if (cnt < 3) return p;

-    
+

     r << p.GetChar(0) << p.GetChar(1);
     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);
     // 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++)
     {
     // remove back references: translate dir1/../dir2 to dir2
     for (; i < cnt; i++)
     {


@@ -223,9 +226,9 @@ static wxString MakeCorrectPath(const wxString& path)
             }
         }
     }
             }
         }
     }

-        
+

     for (; i < cnt; i++) r << p.GetChar(i);
     for (; i < cnt; i++) r << p.GetChar(i);

-        
+

     return r;
 }
 
     return r;
 }
 


@@ -241,7 +244,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
                m_Path << wxT('/');
     }
         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--)
     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)


@@ -300,7 +303,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         switch (loc[i])
         {
     {
         switch (loc[i])
         {

-            case wxT('/') : case wxT(':') : case wxT('#') : 
+            case wxT('/') : case wxT(':') : case wxT('#') :

                 meta = loc[i];
                 break;
         }
                 meta = loc[i];
                 break;
         }


@@ -348,7 +351,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
     wxNode *node;
     wxString spec2(spec);
 {
     wxNode *node;
     wxString spec2(spec);

-    
+

     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)
     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)


@@ -358,10 +361,10 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
     while (node)
     {
         m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
     while (node)
     {
         m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();

-        if (m_FindFileHandler -> CanOpen(m_Path + spec2)) 
+        if (m_FindFileHandler -> CanOpen(m_Path + spec2))

             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
         node = node->GetNext();
             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
         node = node->GetNext();

-    } 
+    }

 
     node = m_Handlers.GetFirst();
     while (node)
 
     node = m_Handlers.GetFirst();
     while (node)


@@ -370,9 +373,9 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();

-    } 
-    
-    return wxEmptyString;   
+    }
+
+    return wxEmptyString;

 }
 
 
 }
 
 


@@ -410,47 +413,47 @@ class wxFileSystemModule : public wxModule
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);

-            
+

             gs_FSMimeFallbacks = new wxFileTypeInfo[6];
             gs_FSMimeFallbacks = new wxFileTypeInfo[6];

-            gs_FSMimeFallbacks[0] = 
+            gs_FSMimeFallbacks[0] =

             wxFileTypeInfo("image/jpeg",
                            "",
                            "",
                            "JPEG image (from fallback)",
                            "jpg", "jpeg", NULL);
             wxFileTypeInfo("image/jpeg",
                            "",
                            "",
                            "JPEG image (from fallback)",
                            "jpg", "jpeg", NULL);

-            gs_FSMimeFallbacks[1] = 
+            gs_FSMimeFallbacks[1] =

             wxFileTypeInfo("image/gif",
                            "",
                            "",
                            "GIF image (from fallback)",
                            "gif", NULL);
             wxFileTypeInfo("image/gif",
                            "",
                            "",
                            "GIF image (from fallback)",
                            "gif", NULL);

-            gs_FSMimeFallbacks[2] = 
+            gs_FSMimeFallbacks[2] =

             wxFileTypeInfo("image/png",
                            "",
                            "",
                            "PNG image (from fallback)",
                            "png", NULL);
             wxFileTypeInfo("image/png",
                            "",
                            "",
                            "PNG image (from fallback)",
                            "png", NULL);

-            gs_FSMimeFallbacks[3] = 
+            gs_FSMimeFallbacks[3] =

             wxFileTypeInfo("image/bmp",
                            "",
                            "",
                            "windows bitmap image (from fallback)",
                            "bmp", NULL);
             wxFileTypeInfo("image/bmp",
                            "",
                            "",
                            "windows bitmap image (from fallback)",
                            "bmp", NULL);

-            gs_FSMimeFallbacks[4] = 
+            gs_FSMimeFallbacks[4] =

             wxFileTypeInfo("text/html",
                            "",
                            "",
                            "HTML document (from fallback)",
                            "htm", "html", NULL);
             wxFileTypeInfo("text/html",
                            "",
                            "",
                            "HTML document (from fallback)",
                            "htm", "html", NULL);

-            gs_FSMimeFallbacks[5] = 
+            gs_FSMimeFallbacks[5] =

             // must terminate the table with this!
             wxFileTypeInfo();
             // must terminate the table with this!
             wxFileTypeInfo();

-            
+

             return TRUE;
         }
         virtual void OnExit()
        {
             return TRUE;
         }
         virtual void OnExit()
        {

-            delete gs_FSMimeFallbacks;
+            delete [] gs_FSMimeFallbacks;

             wxFileSystem::CleanUpHandlers();
        }
 };
             wxFileSystem::CleanUpHandlers();
        }
 };