X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b9ab0bd824b6b9c93849928d67de1ec71e7c167..17ade085be1c9232601f7e588bf6f221ef059949:/src/common/filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index df431a87a5..f8d725c523 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -34,7 +34,7 @@
                 (although :filename works as well).
                 Since the volume is just part of the file path, it is not
                 treated like a separate entity as it is done under DOS and
-                VMS, it is just treated as another dir. 
+                VMS, it is just treated as another dir.
 
    wxPATH_VMS:  VMS native format, absolute file names have the form
                     <device>:[dir1.dir2.dir3]file.txt
@@ -82,10 +82,7 @@
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 #include "wx/file.h"
-
-#if wxUSE_DYNAMIC_LOADER || wxUSE_DYNLIB_CLASS
-#include "wx/dynlib.h"
-#endif
+//#include "wx/dynlib.h"        // see GetLongPath below, code disabled.
 
 // For GetShort/LongPathName
 #ifdef __WIN32__
@@ -101,6 +98,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef __DJGPP__
+#include <unistd.h>
+#endif
+
 #ifdef __MWERKS__
 #include <stat.h>
 #include <unistd.h>
@@ -234,16 +235,25 @@ void wxFileName::Assign(const wxString& volume,
                         const wxString& name,
                         const wxString& ext,
                         wxPathFormat format )
+{
+    SetPath( path, format );
+
+    m_volume = volume;
+    m_ext = ext;
+    m_name = name;
+}
+
+void wxFileName::SetPath( const wxString &path, wxPathFormat format )
 {
     wxPathFormat my_format = GetFormat( format );
     wxString my_path = path;
-    
+
     m_dirs.Clear();
-    
+
     if (!my_path.empty())
     {
         // 1) Determine if the path is relative or absolute.
-        
+
         switch (my_format)
         {
             case wxPATH_MAC:
@@ -251,7 +261,7 @@ void wxFileName::Assign(const wxString& volume,
                 // We then remove a leading ":". The reason is in our
                 // storage form for relative paths:
                 // ":dir:file.txt" actually means "./dir/file.txt" in
-                // DOS notation and should get stored as 
+                // DOS notation and should get stored as
                 // (relative) (dir) (file.txt)
                 // "::dir:file.txt" actually means "../dir/file.txt"
                 // stored as (relative) (..) (dir) (file.txt)
@@ -275,11 +285,11 @@ void wxFileName::Assign(const wxString& volume,
                 wxFAIL_MSG( wxT("error") );
                 break;
         }
-        
+
         // 2) Break up the path into its members. If the original path
         //    was just "/" or "\\", m_dirs will be empty. We know from
         //    the m_relative field, if this means "nothing" or "root dir".
-        
+
         wxStringTokenizer tn( my_path, GetPathSeparators(my_format) );
 
         while ( tn.HasMoreTokens() )
@@ -300,10 +310,10 @@ void wxFileName::Assign(const wxString& volume,
             }
         }
     }
-
-    m_volume = volume;
-    m_ext = ext;
-    m_name = name;
+    else
+    {
+        m_relative = TRUE;
+    }
 }
 
 void wxFileName::Assign(const wxString& fullpath,
@@ -523,7 +533,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     #ifndef __WATCOMC__
         ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL);
     #endif
-    
+
 #else // !Windows, !OS/2
     if ( dir.empty() )
     {
@@ -628,7 +638,16 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     {
         // open the file - of course, there is a race condition here, this is
         // why we always prefer using mkstemp()...
-        if ( !fileTemp->Open(path, wxFile::write_excl, wxS_IRUSR | wxS_IWUSR) )
+        //
+        // NB: GetTempFileName() under Windows creates the file, so using
+        //     write_excl there would fail
+        if ( !fileTemp->Open(path,
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+                             wxFile::write,
+#else
+                             wxFile::write_excl,
+#endif
+                             wxS_IRUSR | wxS_IWUSR) )
         {
             // FIXME: If !ok here should we loop and try again with another
             //        file name?  That is the standard recourse if open(O_EXCL)
@@ -870,7 +889,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
     {
         m_dirs.Insert(wxT(".."), 0u);
     }
-    
+
     m_relative = TRUE;
 
     // we were modified
@@ -1037,7 +1056,7 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
          if (!m_relative)
              fullpath += wxFILE_SEP_PATH_UNIX;
     }
-    
+
     // then concatenate all the path components using the path separator
     size_t dirCount = m_dirs.GetCount();
     if ( dirCount )
@@ -1123,7 +1142,7 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
             // else ignore
         }
     }
-    
+
     // the leading character
     if ( format == wxPATH_MAC && m_relative )
     {
@@ -1139,7 +1158,7 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
          if (!m_relative)
              fullpath += wxFILE_SEP_PATH_UNIX;
     }
-    
+
     // then concatenate all the path components using the path separator
     size_t dirCount = m_dirs.GetCount();
     if ( dirCount )
@@ -1246,19 +1265,17 @@ wxString wxFileName::GetLongPath() const
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
-        wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
-        if ( dllKernel )
+        wxDynamicLibrary dllKernel(_T("kernel32"));
+        if ( dllKernel.IsLoaded() )
         {
             // may succeed or fail depending on the Windows version
             static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
 #ifdef _UNICODE
-            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) dllKernel.GetSymbol(_T("GetLongPathNameW"));
 #else
-            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameA"));
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) dllKernel.GetSymbol(_T("GetLongPathNameA"));
 #endif
 
-            wxDllLoader::UnloadLibrary(dllKernel);
-
             if ( s_pfnGetLongPathName )
             {
                 DWORD dwSize = (*s_pfnGetLongPathName)(path, NULL, 0);