Commented setsockopt as it doesn't work anywhere. I will use signals for timeout.

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 2d4a8690dd3d433f621a6da7f62b6cf2ec4068f8..da3b6342f1274e8269018226d010da02f2845cb6 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -16,6 +16,11 @@
 #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
 
 #include "wx/wfstream.h"
@@ -28,7 +33,13 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
-wxMimeTypesManager wxFileSystemHandler::m_MimeMng;
+wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL;
+
+void wxFileSystemHandler::CleanUpStatics()
+{
+    if (m_MimeMng) delete m_MimeMng;
+    m_MimeMng = NULL;
+}
 
 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
@@ -41,12 +52,13 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
     l2 = l;
     for (int i = l-1; i >= 0; i--) {
-        c = loc[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;}
     }
-    ft = m_MimeMng.GetFileTypeFromExtension(ext);
+    if (m_MimeMng == NULL) m_MimeMng = new wxMimeTypesManager;
+    ft = m_MimeMng -> GetFileTypeFromExtension(ext);
     if (ft && (ft -> GetMimeType(&mime))) return mime;
     else return wxEmptyString;
 }
@@ -149,15 +161,15 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     m_Path = location;
 
     for (i = m_Path.Length()-1; i >= 0; i--)
-        if (m_Path[i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/');         // wanna be windows-safe
+        if (m_Path[(unsigned int) i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/');         // wanna be windows-safe
 
     if (is_dir == FALSE) 
     {
         for (i = m_Path.Length()-1; i >= 0; i--) 
        {
-            if (m_Path[i] == _T('/')) 
+            if (m_Path[(unsigned int) i] == _T('/'))
            {
-                if ((i > 1) && (m_Path[i-1] == _T('/')) && (m_Path[i-2] == _T(':'))) 
+                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == _T('/')) && (m_Path[(unsigned int) (i-2)] == _T(':')))
                {
                     i -= 2;
                     continue;
@@ -168,7 +180,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
                     break;
                 }
             }
-        else if (m_Path[i] == _T(':')) {
+        else if (m_Path[(unsigned int) i] == _T(':')) {
             pathpos = i;
         break;
         }
@@ -177,7 +189,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
        {
             for (i = 0; i < (int) m_Path.Length(); i++) 
            {
-                if (m_Path[i] == _T(':')) 
+                if (m_Path[(unsigned int) i] == _T(':'))
                {
                     //m_Path << _T('/');
                     m_Path.Remove(i+1);
@@ -210,10 +222,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     meta = 0;
     for (i = 0; i < ln; i++) 
     {
-        if (loc[i] == _T('\\')) loc.GetWritableChar(i) = _T('/');         // wanna be windows-safe
-        if (!meta) switch (loc[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[i];
+            case _T('/') : case _T(':') : case _T('#') : meta = loc[(unsigned int) i];
         }
     }
     m_LastName = wxEmptyString;
@@ -272,7 +284,10 @@ class wxFileSystemModule : public wxModule
             wxFileSystem::AddHandler(new wxLocalFSHandler);
             return TRUE;
         }
-        virtual void OnExit() {}
+        virtual void OnExit() 
+       {
+           wxFileSystemHandler::CleanUpStatics();
+       }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
@@ -280,3 +295,5 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 #endif 
   // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
 
+
+