compilation fix for DJGPP

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 2bb2b0be196d4673e22b3859d5334028604946a5..086750834279f7e5f1887b43c764ad252f90a038 100644 (file)
--- 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
                 (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
 
    wxPATH_VMS:  VMS native format, absolute file names have the form
                     <device>:[dir1.dir2.dir3]file.txt


@@ -61,55 +61,57 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

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

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+#pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/intl.h"
-    #include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "wx/file.h"

 #endif
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 #endif
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"

-
-#if wxUSE_DYNLIB_CLASS
-    #include "wx/dynlib.h"
-#endif
+#include "wx/file.h"
+//#include "wx/dynlib.h"        // see GetLongPath below, code disabled.

 
 // For GetShort/LongPathName
 #ifdef __WIN32__
 
 // For GetShort/LongPathName
 #ifdef __WIN32__

-    #include <windows.h>
-
-    #include "wx/msw/winundef.h"
+#include <windows.h>
+#include "wx/msw/winundef.h"

 #endif
 
 // utime() is POSIX so should normally be available on all Unices
 #ifdef __UNIX_LIKE__
 #endif
 
 // utime() is POSIX so should normally be available on all Unices
 #ifdef __UNIX_LIKE__

-    #include <sys/types.h>
-    #include <utime.h>
-    #include <sys/stat.h>
-    #include <unistd.h>
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+#ifdef __DJGPP__
+#include <unistd.h>

 #endif
 
 #ifdef __MWERKS__
 #endif
 
 #ifdef __MWERKS__

-    #include <stat.h>
-    #include <unistd.h>
-    #include <unix.h>
+#include <stat.h>
+#include <unistd.h>
+#include <unix.h>

 #endif
 
 #ifdef __WATCOMC__
 #endif
 
 #ifdef __WATCOMC__

-    #include <io.h>
-    #include <sys/utime.h>
-    #include <sys/stat.h>
+#include <io.h>
+#include <sys/utime.h>
+#include <sys/stat.h>

 #endif
 
 #ifdef __VISAGECPP__
 #endif
 
 #ifdef __VISAGECPP__


@@ -233,16 +235,25 @@ void wxFileName::Assign(const wxString& volume,
                         const wxString& name,
                         const wxString& ext,
                         wxPathFormat format )
                         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;
 {
     wxPathFormat my_format = GetFormat( format );
     wxString my_path = path;

-    
+

     m_dirs.Clear();
     m_dirs.Clear();

-    
+

     if (!my_path.empty())
     {
         // 1) Determine if the path is relative or absolute.
     if (!my_path.empty())
     {
         // 1) Determine if the path is relative or absolute.

-        
+

         switch (my_format)
         {
             case wxPATH_MAC:
         switch (my_format)
         {
             case wxPATH_MAC:


@@ -250,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
                 // 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)
                 // (relative) (dir) (file.txt)
                 // "::dir:file.txt" actually means "../dir/file.txt"
                 // stored as (relative) (..) (dir) (file.txt)


@@ -274,11 +285,11 @@ void wxFileName::Assign(const wxString& volume,
                 wxFAIL_MSG( wxT("error") );
                 break;
         }
                 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".
         // 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() )
         wxStringTokenizer tn( my_path, GetPathSeparators(my_format) );
 
         while ( tn.HasMoreTokens() )


@@ -299,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,
 }
 
 void wxFileName::Assign(const wxString& fullpath,


@@ -456,9 +467,9 @@ wxString wxFileName::GetHomeDir()
     return ::wxGetHomeDir();
 }
 
     return ::wxGetHomeDir();
 }
 

-void wxFileName::AssignTempFileName( const wxString& prefix )
+void wxFileName::AssignTempFileName(const wxString& prefix, wxFile *fileTemp)

 {
 {

-    wxString tempname = CreateTempFileName(prefix);
+    wxString tempname = CreateTempFileName(prefix, fileTemp);

     if ( tempname.empty() )
     {
         // error, failed to get temp file name
     if ( tempname.empty() )
     {
         // error, failed to get temp file name


@@ -471,7 +482,8 @@ void wxFileName::AssignTempFileName( const wxString& prefix )
 }
 
 /* static */
 }
 
 /* static */

-wxString wxFileName::CreateTempFileName(const wxString& prefix)
+wxString
+wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)

 {
     wxString path, dir, name;
 
 {
     wxString path, dir, name;
 


@@ -521,7 +533,7 @@ wxString wxFileName::CreateTempFileName(const wxString& prefix)
     #ifndef __WATCOMC__
         ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL);
     #endif
     #ifndef __WATCOMC__
         ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL);
     #endif

-    
+

 #else // !Windows, !OS/2
     if ( dir.empty() )
     {
 #else // !Windows, !OS/2
     if ( dir.empty() )
     {


@@ -558,13 +570,25 @@ wxString wxFileName::CreateTempFileName(const wxString& prefix)
 
     // can use the cast here because the length doesn't change and the string
     // is not shared
 
     // can use the cast here because the length doesn't change and the string
     // is not shared

-    if ( mkstemp((char *)path.mb_str()) == -1 )
+    int fdTemp = mkstemp((char *)path.mb_str());
+    if ( fdTemp == -1 )

     {
         // this might be not necessary as mkstemp() on most systems should have
         // already done it but it doesn't hurt neither...
         path.clear();
     }
     {
         // this might be not necessary as mkstemp() on most systems should have
         // already done it but it doesn't hurt neither...
         path.clear();
     }

-    //else: file already created
+    else // mkstemp() succeeded
+    {
+        // avoid leaking the fd
+        if ( fileTemp )
+        {
+            fileTemp->Attach(fdTemp);
+        }
+        else
+        {
+            close(fdTemp);
+        }
+    }

 #else // !HAVE_MKSTEMP
 
 #ifdef HAVE_MKTEMP
 #else // !HAVE_MKSTEMP
 
 #ifdef HAVE_MKTEMP


@@ -601,10 +625,29 @@ wxString wxFileName::CreateTempFileName(const wxString& prefix)
 
     if ( !path.empty() )
     {
 
     if ( !path.empty() )
     {

-        // create the file - of course, there is a race condition here, this is
+    }
+#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP
+
+#endif // Windows/!Windows
+
+    if ( path.empty() )
+    {
+        wxLogSysError(_("Failed to create a temporary file name"));
+    }
+    else if ( fileTemp && !fileTemp->IsOpened() )
+    {
+        // open the file - of course, there is a race condition here, this is

         // why we always prefer using mkstemp()...
         // why we always prefer using mkstemp()...

-        wxFile file;
-        if ( !file.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)
         {
             // FIXME: If !ok here should we loop and try again with another
             //        file name?  That is the standard recourse if open(O_EXCL)


@@ -616,14 +659,6 @@ wxString wxFileName::CreateTempFileName(const wxString& prefix)
             path.clear();
         }
     }
             path.clear();
         }
     }

-#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP
-
-#endif // Windows/!Windows
-
-    if ( path.empty() )
-    {
-        wxLogSysError(_("Failed to create a temporary file name"));
-    }

 
     return path;
 }
 
     return path;
 }


@@ -728,6 +763,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
             }
         }
 #endif
             }
         }
 #endif

+        m_relative = FALSE;

     }
 
     // handle ~ stuff under Unix only
     }
 
     // handle ~ stuff under Unix only


@@ -853,7 +889,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
     {
         m_dirs.Insert(wxT(".."), 0u);
     }
     {
         m_dirs.Insert(wxT(".."), 0u);
     }

-    
+

     m_relative = TRUE;
 
     // we were modified
     m_relative = TRUE;
 
     // we were modified


@@ -1020,7 +1056,7 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
          if (!m_relative)
              fullpath += wxFILE_SEP_PATH_UNIX;
     }
          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 )
     // then concatenate all the path components using the path separator
     size_t dirCount = m_dirs.GetCount();
     if ( dirCount )


@@ -1090,23 +1126,23 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
     // first put the volume
     if ( !m_volume.empty() )
     {
     // first put the volume
     if ( !m_volume.empty() )
     {

-       {
-               // Special Windows UNC paths hack, part 2: undo what we did in
-               // SplitPath() and make an UNC path if we have a drive which is not a
-               // single letter (hopefully the network shares can't be one letter only
-               // although I didn't find any authoritative docs on this)
-               if ( format == wxPATH_DOS && m_volume.length() > 1 )
-               {
-               fullpath << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << m_volume;
-               }
-               else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
-               {
-               fullpath << m_volume << GetVolumeSeparator(format);
+        {
+            // Special Windows UNC paths hack, part 2: undo what we did in
+            // SplitPath() and make an UNC path if we have a drive which is not a
+            // single letter (hopefully the network shares can't be one letter only
+            // although I didn't find any authoritative docs on this)
+            if ( format == wxPATH_DOS && m_volume.length() > 1 )
+            {
+                fullpath << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << m_volume;
+            }
+            else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
+            {
+                fullpath << m_volume << GetVolumeSeparator(format);

             }
             // else ignore
         }
     }
             }
             // else ignore
         }
     }

-    
+

     // the leading character
     if ( format == wxPATH_MAC && m_relative )
     {
     // the leading character
     if ( format == wxPATH_MAC && m_relative )
     {


@@ -1122,7 +1158,7 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
          if (!m_relative)
              fullpath += wxFILE_SEP_PATH_UNIX;
     }
          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 )
     // then concatenate all the path components using the path separator
     size_t dirCount = m_dirs.GetCount();
     if ( dirCount )


@@ -1221,7 +1257,7 @@ wxString wxFileName::GetLongPath() const
     bool success = FALSE;
 
     // VZ: this code was disabled, why?
     bool success = FALSE;
 
     // VZ: this code was disabled, why?

-#if 0 // wxUSE_DYNLIB_CLASS
+#if 0 // wxUSE_DYNAMIC_LOADER

     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;


@@ -1269,7 +1305,7 @@ wxString wxFileName::GetLongPath() const
     }
     if (success)
         return pathOut;
     }
     if (success)
         return pathOut;

-#endif // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNAMIC_LOADER

 
     if (!success)
     {
 
     if (!success)
     {