don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 197fec89413dbd81b9dcd95772a81a003cbfa669..5fe670302135d5ef55069a078497a287918d29fd 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"

 
 
 
 
 
 


@@ -35,67 +35,61 @@
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 

+#if wxUSE_MIMETYPE
+static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
+#endif
+

 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
 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;
     wxString loc = GetRightLocation(location);
     char c;
     int l = loc.Length(), l2;

-    wxFileType *ft;

 
     l2 = l;
 
     l2 = l;

-    for (int i = l-1; i >= 0; i--) {
+    for (int i = l-1; i >= 0; i--)
+    {

         c = loc[(unsigned int) i];
         c = loc[(unsigned int) i];

-        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 ( 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 wxUSE_MIMETYPE

     static bool s_MinimalMimeEnsured = FALSE;
     if (!s_MinimalMimeEnsured) {
     static bool s_MinimalMimeEnsured = FALSE;
     if (!s_MinimalMimeEnsured) {

-        static const wxFileTypeInfo fallbacks[] =
-        {
-            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()
-        };
-
-        wxTheMimeTypesManager -> AddFallbacks(fallbacks);
+        wxTheMimeTypesManager->AddFallbacks(gs_FSMimeFallbacks);
+        s_MinimalMimeEnsured = TRUE;

     }
 
     }
 

-    ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
-    if ( !ft || !ft -> GetMimeType(&mime) ) {
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+    if ( !ft || !ft -> GetMimeType(&mime) )
+    {

         mime = wxEmptyString;
     }
 
     delete ft;
 
     return mime;
         mime = wxEmptyString;
     }
 
     delete ft;
 
     return mime;

+#else
+    if ( ext.IsSameAs(wxT("htm"), FALSE) || ext.IsSameAs(_T("html"), FALSE) )
+        return wxT("text/html");
+    if ( ext.IsSameAs(wxT("jpg"), FALSE) || ext.IsSameAs(_T("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;
+#endif

 }
 
 
 }
 
 


@@ -167,15 +161,8 @@ wxString wxFileSystemHandler::FindNext()
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 

-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();
-};

 
 

+wxString wxLocalFSHandler::ms_root;

 
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {
 
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {


@@ -184,21 +171,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {

-    wxString right = GetRightLocation(location);
-    if (!wxFileExists(right))
+    // location has Unix path separators
+    wxString right = ms_root + GetRightLocation(location);
+    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())));

 
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {
 
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {

-    wxString right = GetRightLocation(spec);
+    wxString right = ms_root + GetRightLocation(spec);

     return wxFindFirstFile(right, flags);
 }
 
     return wxFindFirstFile(right, flags);
 }
 


@@ -214,6 +204,7 @@ wxString wxLocalFSHandler::FindNext()
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)

+IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)

 
 
 wxList wxFileSystem::m_Handlers;
 
 
 wxList wxFileSystem::m_Handlers;


@@ -224,20 +215,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++)
     {


@@ -252,9 +243,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;
 }
 


@@ -270,7 +261,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--)


@@ -327,11 +318,13 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     meta = 0;
     for (i = 0; i < ln; i++)
     {
     meta = 0;
     for (i = 0; i < ln; i++)
     {

-        if (!meta) 
-            switch (loc[i])
-               {
-                case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[i];
-            }
+        switch (loc[i])
+        {
+            case wxT('/') : case wxT(':') : case wxT('#') :
+                meta = loc[i];
+                break;
+        }
+        if (meta != 0) break;

     }
     m_LastName = wxEmptyString;
 
     }
     m_LastName = wxEmptyString;
 


@@ -375,7 +368,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--)


@@ -385,10 +378,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)


@@ -397,9 +390,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;

 }
 
 
 }
 
 


@@ -437,10 +430,50 @@ class wxFileSystemModule : public wxModule
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);

+
+        #if wxUSE_MIMETYPE
+            gs_FSMimeFallbacks = new wxFileTypeInfo[6];
+            gs_FSMimeFallbacks[0] =
+            wxFileTypeInfo("image/jpeg",
+                           "",
+                           "",
+                           "JPEG image (from fallback)",
+                           "jpg", "jpeg", NULL);
+            gs_FSMimeFallbacks[1] =
+            wxFileTypeInfo("image/gif",
+                           "",
+                           "",
+                           "GIF image (from fallback)",
+                           "gif", NULL);
+            gs_FSMimeFallbacks[2] =
+            wxFileTypeInfo("image/png",
+                           "",
+                           "",
+                           "PNG image (from fallback)",
+                           "png", NULL);
+            gs_FSMimeFallbacks[3] =
+            wxFileTypeInfo("image/bmp",
+                           "",
+                           "",
+                           "windows bitmap image (from fallback)",
+                           "bmp", NULL);
+            gs_FSMimeFallbacks[4] =
+            wxFileTypeInfo("text/html",
+                           "",
+                           "",
+                           "HTML document (from fallback)",
+                           "htm", "html", NULL);
+            gs_FSMimeFallbacks[5] =
+            // must terminate the table with this!
+            wxFileTypeInfo();
+        #endif

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

+        #if wxUSE_MIMETYPE
+            delete [] gs_FSMimeFallbacks;
+        #endif

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