src/common/strconv.cpps/wcslen/wxWcslen/g

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 120cfc28f0da11efabbc12ffc1d3e2dbb0bad2d0..93b65254dd35fd1dbf554a75c00eb68c0d35b85b 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "filesys.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -17,18 +17,14 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if !wxUSE_SOCKETS
-    #undef wxUSE_FS_INET
-    #define wxUSE_FS_INET 0
-#endif

 
 

-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM

 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"
 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"

-
+#include "wx/filename.h"

 
 
 
 
 
 


@@ -39,68 +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))) {
-        delete ft; 
-        return mime;
-    }
-    else {
-        delete ft;
-        return wxEmptyString;
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+    if ( !ft || !ft -> GetMimeType(&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

 }
 
 
 }
 
 


@@ -172,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)
 {


@@ -189,19 +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))
-        return new wxFSFile(new wxFileInputStream(right),
-                            right,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location),
-                            wxDateTime(wxFileModificationTime(right)));
-    else return (wxFSFile*) NULL;
+    // location has Unix path separators
+    wxString right = ms_root + GetRightLocation(location);
+    wxFileName fn(right, wxPATH_UNIX);
+
+    if (!wxFileExists(fn.GetFullPath()))
+        return (wxFSFile*) NULL;
+
+    return new wxFSFile(new wxFFileInputStream(fn.GetFullPath()),
+                        right,
+                        GetMimeTypeFromExt(location),
+                        GetAnchor(location),
+                        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);
 }
 


@@ -217,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;


@@ -227,37 +215,37 @@ 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++)
     cnt = p.Length();
     for (i = 0; i < cnt; i++)

-        if (p[i] == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
-        
+      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[0] << p[1];
-    
+
+    r << p.GetChar(0) << p.GetChar(1);
+

     // skip trailing ../.., if any
     // skip trailing ../.., if any

-    for (i = 2; i < cnt && (p[i] == wxT('/') || p[i] == wxT('.')); i++) r << p[i];
-    
+    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++)
     {

-        r << p[i];
-        if (p[i] == wxT('/') && p[i-1] == wxT('.') && p[i-2] == wxT('.'))
+        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[j] != wxT('/') && r[j] != wxT(':'); j--) {}
-            if (j >= 0 && r[j] != 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[j] != wxT('/') && r[j] != wxT(':'); j--) {}
+                for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}

                 r.Remove(j + 1);
             }
         }
     }
                 r.Remove(j + 1);
             }
         }
     }

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

     return r;
 }
 
     return r;
 }
 


@@ -271,22 +259,22 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     if (is_dir)
     {
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
     if (is_dir)
     {
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))

-               m_Path << wxT('/');
+            m_Path << wxT('/');

     }
     }

-    
+

     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)
     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)

-       {
+        {

             if (m_Path[(unsigned int) i] == wxT('/'))
             if (m_Path[(unsigned int) i] == wxT('/'))

-               {
+            {

                 if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
                 if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))

-                       {
+                {

                     i -= 2;
                     continue;
                 }
                 else
                     i -= 2;
                     continue;
                 }
                 else

-                       {
+                {

                     pathpos = i;
                     break;
                 }
                     pathpos = i;
                     break;
                 }


@@ -297,20 +285,20 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
             }
         }
         if (pathpos == -1)
             }
         }
         if (pathpos == -1)

-       {
+        {

             for (i = 0; i < (int) m_Path.Length(); i++)
             for (i = 0; i < (int) m_Path.Length(); i++)

-           {
+            {

                 if (m_Path[(unsigned int) i] == wxT(':'))
                 if (m_Path[(unsigned int) i] == wxT(':'))

-                       {
+                {

                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())
                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())

-               m_Path = wxEmptyString;
+                m_Path = wxEmptyString;

         }
         else
         }
         else

-       {
+        {

             m_Path.Remove(pathpos+1);
         }
     }
             m_Path.Remove(pathpos+1);
         }
     }


@@ -330,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;
 


@@ -343,10 +333,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
     {
         node = m_Handlers.GetFirst();
         while (node)

-       {
+        {

             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             if (h->CanOpen(m_Path + loc))
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             if (h->CanOpen(m_Path + loc))

-               {
+            {

                 s = h->OpenFile(*this, m_Path + loc);
                 if (s) { m_LastName = m_Path + loc; break; }
             }
                 s = h->OpenFile(*this, m_Path + loc);
                 if (s) { m_LastName = m_Path + loc; break; }
             }


@@ -359,10 +349,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
     {
         node = m_Handlers.GetFirst();
         while (node)

-       {
+        {

             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
             if (h->CanOpen(loc))
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
             if (h->CanOpen(loc))

-           {
+            {

                 s = h->OpenFile(*this, loc);
                 if (s) { m_LastName = loc; break; }
             }
                 s = h->OpenFile(*this, loc);
                 if (s) { m_LastName = loc; break; }
             }


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

-        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
+        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe

 
     node = m_Handlers.GetFirst();
     while (node)
     {
         m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
 
     node = m_Handlers.GetFirst();
     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)


@@ -400,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;

 }
 
 
 }
 
 


@@ -440,18 +430,58 @@ 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(_T("image/jpeg"),
+                           _T(""),
+                           _T(""),
+                           _T("JPEG image (from fallback)"),
+                           _T("jpg"), _T("jpeg"), NULL);
+            gs_FSMimeFallbacks[1] =
+            wxFileTypeInfo(_T("image/gif"),
+                           _T(""),
+                           _T(""),
+                           _T("GIF image (from fallback)"),
+                           _T("gif"), NULL);
+            gs_FSMimeFallbacks[2] =
+            wxFileTypeInfo(_T("image/png"),
+                           _T(""),
+                           _T(""),
+                           _T("PNG image (from fallback)"),
+                           _T("png"), NULL);
+            gs_FSMimeFallbacks[3] =
+            wxFileTypeInfo(_T("image/bmp"),
+                           _T(""),
+                           _T(""),
+                           _T("windows bitmap image (from fallback)"),
+                           _T("bmp"), NULL);
+            gs_FSMimeFallbacks[4] =
+            wxFileTypeInfo(_T("text/html"),
+                           _T(""),
+                           _T(""),
+                           _T("HTML document (from fallback)"),
+                           _T("htm"), _T("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();

-       }
+        }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif

-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM