X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fc67e5cf4dae0c14666546cfb07179b5b563c9e..444d61ba4a97c6cb66101fb3455ebfc593175abf:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 9a63058af1..0867508342 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 :[dir1.dir2.dir3]file.txt @@ -61,55 +61,57 @@ // ---------------------------------------------------------------------------- #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__ - #pragma hdrstop +#pragma hdrstop #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" - -#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__ - #include - - #include "wx/msw/winundef.h" +#include +#include "wx/msw/winundef.h" #endif // utime() is POSIX so should normally be available on all Unices #ifdef __UNIX_LIKE__ - #include - #include - #include - #include +#include +#include +#include +#include +#endif + +#ifdef __DJGPP__ +#include #endif #ifdef __MWERKS__ - #include - #include - #include +#include +#include +#include #endif #ifdef __WATCOMC__ - #include - #include - #include +#include +#include +#include #endif #ifdef __VISAGECPP__ @@ -233,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: @@ -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 - // 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) @@ -274,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() ) @@ -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, @@ -456,9 +467,9 @@ wxString wxFileName::GetHomeDir() 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 @@ -471,7 +482,8 @@ void wxFileName::AssignTempFileName( const wxString& prefix ) } /* static */ -wxString wxFileName::CreateTempFileName(const wxString& prefix) +wxString +wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) { wxString path, dir, name; @@ -521,7 +533,7 @@ wxString wxFileName::CreateTempFileName(const wxString& prefix) #ifndef __WATCOMC__ ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL); #endif - + #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 - 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(); } - //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 @@ -601,10 +625,29 @@ wxString wxFileName::CreateTempFileName(const wxString& prefix) 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()... - 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) @@ -616,14 +659,6 @@ wxString wxFileName::CreateTempFileName(const wxString& prefix) path.clear(); } } -#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP - -#endif // Windows/!Windows - - if ( path.empty() ) - { - wxLogSysError(_("Failed to create a temporary file name")); - } return path; } @@ -854,7 +889,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) { m_dirs.Insert(wxT(".."), 0u); } - + m_relative = TRUE; // we were modified @@ -1021,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 ) @@ -1107,7 +1142,7 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const // else ignore } } - + // the leading character if ( format == wxPATH_MAC && m_relative ) { @@ -1123,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 ) @@ -1222,7 +1257,7 @@ wxString wxFileName::GetLongPath() const 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; @@ -1270,7 +1305,7 @@ wxString wxFileName::GetLongPath() const } if (success) return pathOut; -#endif // wxUSE_DYNLIB_CLASS +#endif // wxUSE_DYNAMIC_LOADER if (!success) {