X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62dcaed6ba085afc4f92ed28fa24c8b8349fd598..43a997b6e2064a189fa73ca1816908fb740ce297:/src/common/filename.cpp?ds=sidebyside diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 477ff3f121..c711152e64 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -146,7 +146,7 @@ public: m_hFile = ::CreateFile ( filename, // name - mode == Read ? GENERIC_READ // access mask + mode == Read ? GENERIC_READ // access mask : GENERIC_WRITE, 0, // no sharing NULL, // no secutity attr @@ -415,7 +415,7 @@ void wxFileName::Assign(const wxString& fullpathOrig, _T("the path shouldn't contain file name nor extension") ); #else // !__WXDEBUG__ - SplitPath(fullname, NULL /* no path */, &name, &ext, format); + SplitPath(fullname, NULL /* no path */, &name, &ext, format); SplitPath(fullpath, &volume, &path, NULL, NULL, format); #endif // __WXDEBUG__/!__WXDEBUG__ @@ -638,9 +638,11 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) // scratch space for mkstemp() path += _T("XXXXXX"); - // can use the cast here because the length doesn't change and the string - // is not shared - int fdTemp = mkstemp((char *)path.mb_str()); + // we need to copy the path to the buffer in which mkstemp() can modify it + wxCharBuffer buf(path.fn_str()); + + // cast is safe because the string length doesn't change + int fdTemp = mkstemp( (char *)buf.data() ); if ( fdTemp == -1 ) { // this might be not necessary as mkstemp() on most systems should have @@ -649,6 +651,8 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) } else // mkstemp() succeeded { + path = wxConvFile.cMB2WX(buf); + // avoid leaking the fd if ( fileTemp ) { @@ -665,10 +669,15 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) // same as above path += _T("XXXXXX"); - if ( !mktemp((char *)path.mb_str()) ) + wxCharBuffer buf(path.fn_str()); + if ( !mktemp( buf ) ) { path.clear(); } + else + { + path = wxConvFile.cMB2WX(buf); + } #else // !HAVE_MKTEMP (includes __DOS__) // generate the unique file name ourselves #ifndef __DOS__ @@ -751,10 +760,10 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) filename.AssignDir(dir); wxString currPath; - if ( filename.HasVolume()) - { + if ( filename.HasVolume()) + { currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE); - } + } wxArrayString dirs = filename.GetDirs(); size_t count = dirs.GetCount(); @@ -912,6 +921,11 @@ bool wxFileName::Normalize(int flags, m_ext.MakeLower(); } + // we do have the path now + // + // NB: need to do this before (maybe) calling Assign() below + m_relative = FALSE; + #if defined(__WIN32__) if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) ) { @@ -919,9 +933,6 @@ bool wxFileName::Normalize(int flags, } #endif // Win32 - // we do have the path now - m_relative = FALSE; - return TRUE; } @@ -991,7 +1002,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) if ( m_dirs.IsEmpty() && IsDir() ) { m_dirs.Add(_T('.')); - } + } } m_relative = TRUE; @@ -1144,113 +1155,40 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const } // the leading character - if ( format == wxPATH_MAC ) - { - if ( m_relative ) - fullpath += wxFILE_SEP_PATH_MAC; - } - else if ( format == wxPATH_DOS ) - { - if (!m_relative) - fullpath += wxFILE_SEP_PATH_DOS; - } - else if ( format == wxPATH_UNIX ) + switch ( format ) { - if (!m_relative) - fullpath += wxFILE_SEP_PATH_UNIX; - } + case wxPATH_MAC: + if ( m_relative ) + fullpath += wxFILE_SEP_PATH_MAC; + break; - // then concatenate all the path components using the path separator - size_t dirCount = m_dirs.GetCount(); - if ( dirCount ) - { - if ( format == wxPATH_VMS ) - { - fullpath += wxT('['); - } + case wxPATH_DOS: + if (!m_relative) + fullpath += wxFILE_SEP_PATH_DOS; + break; - for ( size_t i = 0; i < dirCount; i++ ) - { - // TODO: What to do with ".." under VMS + default: + wxFAIL_MSG( _T("unknown path format") ); + // fall through - switch (format) + case wxPATH_UNIX: + if ( !m_relative ) { - case wxPATH_MAC: - { - if (m_dirs[i] == wxT(".")) - break; - if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing - fullpath += m_dirs[i]; - fullpath += wxT(':'); - break; - } - case wxPATH_DOS: - { - fullpath += m_dirs[i]; - fullpath += wxT('\\'); - break; - } - case wxPATH_UNIX: + // normally the absolute file names starts with a slash with + // one exception: file names like "~/foo.bar" don't have it + if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') ) { - fullpath += m_dirs[i]; - fullpath += wxT('/'); - break; - } - case wxPATH_VMS: - { - if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing - fullpath += m_dirs[i]; - if (i == dirCount-1) - fullpath += wxT(']'); - else - fullpath += wxT('.'); - break; - } - default: - { - wxFAIL_MSG( wxT("error") ); + fullpath += wxFILE_SEP_PATH_UNIX; } } - } - } - - if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() ) - { - fullpath += GetPathSeparator(format); - } - - return fullpath; -} - -wxString wxFileName::GetFullPath( wxPathFormat format ) const -{ - format = GetFormat(format); - - // first put the volume - wxString fullpath = wxGetVolumeString(m_volume, format); + break; - // the leading character - if ( format == wxPATH_MAC ) - { - if ( m_relative ) - fullpath += wxFILE_SEP_PATH_MAC; - } - else if ( format == wxPATH_DOS ) - { - if ( !m_relative ) - fullpath += wxFILE_SEP_PATH_DOS; - } - else if ( format == wxPATH_UNIX ) - { - if ( !m_relative ) - { - // normally the absolute file names starts with a slash with one - // exception: file names like "~/foo.bar" don't have it - if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') ) - { - fullpath += wxFILE_SEP_PATH_UNIX; - } - } + case wxPATH_VMS: + // no leading character here but use this place to unset + // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense as, + // if I understand correctly, there should never be a dot before + // the closing bracket + flags &= ~wxPATH_GET_SEPARATOR; } // then concatenate all the path components using the path separator @@ -1262,53 +1200,61 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const fullpath += wxT('['); } - for ( size_t i = 0; i < dirCount; i++ ) { - // TODO: What to do with ".." under VMS - switch (format) { case wxPATH_MAC: - { - if (m_dirs[i] == wxT(".")) - break; - if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing + if ( m_dirs[i] == wxT(".") ) + { + // skip appending ':', this shouldn't be done in this + // case as "::" is interpreted as ".." under Unix + continue; + } + + // convert back from ".." to nothing + if ( m_dirs[i] != wxT("..") ) fullpath += m_dirs[i]; - fullpath += wxT(':'); break; - } + + default: + wxFAIL_MSG( wxT("unexpected path format") ); + // still fall through + case wxPATH_DOS: - { - fullpath += m_dirs[i]; - fullpath += wxT('\\'); - break; - } case wxPATH_UNIX: - { fullpath += m_dirs[i]; - fullpath += wxT('/'); break; - } + case wxPATH_VMS: - { - if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing + // TODO: What to do with ".." under VMS + + // convert back from ".." to nothing + if ( m_dirs[i] != wxT("..") ) fullpath += m_dirs[i]; - if (i == dirCount-1) - fullpath += wxT(']'); - else - fullpath += wxT('.'); break; - } - default: - { - wxFAIL_MSG( wxT("error") ); - } } + + if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) ) + fullpath += GetPathSeparator(format); + } + + if ( format == wxPATH_VMS ) + { + fullpath += wxT(']'); } } - // finally add the file name and extension + return fullpath; +} + +wxString wxFileName::GetFullPath( wxPathFormat format ) const +{ + // we already have a function to get the path + wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR, + format); + + // now just add the file name and extension to it fullpath += GetFullName(); return fullpath; @@ -1357,6 +1303,9 @@ wxString wxFileName::GetLongPath() const if ( !s_triedToLoad ) { + // suppress the errors about missing GetLongPathName[AW] + wxLogNull noLog; + s_triedToLoad = TRUE; wxDynamicLibrary dllKernel(_T("kernel32")); if ( dllKernel.IsLoaded() ) @@ -1394,6 +1343,7 @@ wxString wxFileName::GetLongPath() const } } } + if (success) return pathOut; #endif // wxUSE_DYNAMIC_LOADER @@ -1660,7 +1610,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtAccess, utimbuf utm; utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks(); utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks(); - if ( utime(GetFullPath(), &utm) == 0 ) + if ( utime(GetFullPath().fn_str(), &utm) == 0 ) { return TRUE; } @@ -1698,7 +1648,7 @@ bool wxFileName::Touch() { #if defined(__UNIX_LIKE__) // under Unix touching file is simple: just pass NULL to utime() - if ( utime(GetFullPath(), NULL) == 0 ) + if ( utime(GetFullPath().fn_str(), NULL) == 0 ) { return TRUE; } @@ -1719,7 +1669,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, { #if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) wxStructStat stBuf; - if ( wxStat(GetFullPath(), &stBuf) == 0 ) + if ( wxStat( GetFullPath().c_str(), &stBuf) == 0 ) { if ( dtAccess ) dtAccess->Set(stBuf.st_atime); @@ -1737,16 +1687,16 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, FILETIME ftAccess, ftCreate, ftWrite; if ( ::GetFileTime(fh, - dtMod ? &ftCreate : NULL, + dtCreate ? &ftCreate : NULL, dtAccess ? &ftAccess : NULL, - dtCreate ? &ftWrite : NULL) ) + dtMod ? &ftWrite : NULL) ) { - if ( dtMod ) - ConvertFileTimeToWx(dtMod, ftCreate); + if ( dtCreate ) + ConvertFileTimeToWx(dtCreate, ftCreate); if ( dtAccess ) ConvertFileTimeToWx(dtAccess, ftAccess); - if ( dtCreate ) - ConvertFileTimeToWx(dtCreate, ftWrite); + if ( dtMod ) + ConvertFileTimeToWx(dtMod, ftWrite); return TRUE; } @@ -1763,41 +1713,64 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, #ifdef __WXMAC__ const short kMacExtensionMaxLength = 16 ; -typedef struct +class MacDefaultExtensionRecord { +public : + MacDefaultExtensionRecord() + { + m_ext[0] = 0 ; + m_type = m_creator = NULL ; + } + MacDefaultExtensionRecord( const MacDefaultExtensionRecord& from ) + { + strcpy( m_ext , from.m_ext ) ; + m_type = from.m_type ; + m_creator = from.m_creator ; + } + MacDefaultExtensionRecord( char * extension , OSType type , OSType creator ) + { + strncpy( m_ext , extension , kMacExtensionMaxLength ) ; + m_ext[kMacExtensionMaxLength] = 0 ; + m_type = type ; + m_creator = creator ; + } char m_ext[kMacExtensionMaxLength] ; OSType m_type ; OSType m_creator ; -} MacDefaultExtensionRecord ; +} ; #include "wx/dynarray.h" WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray) ; + +bool gMacDefaultExtensionsInited = false ; + #include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(MacDefaultExtensionArray) ; + +WX_DEFINE_EXPORTED_OBJARRAY(MacDefaultExtensionArray) ; MacDefaultExtensionArray gMacDefaultExtensions ; -bool gMacDefaultExtensionsInited = false ; static void MacEnsureDefaultExtensionsLoaded() { if ( !gMacDefaultExtensionsInited ) { + // load the default extensions - MacDefaultExtensionRecord defaults[] = + MacDefaultExtensionRecord defaults[1] = { - { "txt" , 'TEXT' , 'ttxt' } , - + MacDefaultExtensionRecord( "txt" , 'TEXT' , 'ttxt' ) , + } ; // we could load the pc exchange prefs here too - + for ( int i = 0 ; i < WXSIZEOF( defaults ) ; ++i ) { gMacDefaultExtensions.Add( defaults[i] ) ; - } + } gMacDefaultExtensionsInited = true ; } } -bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) +bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) { FInfo fndrInfo ; FSSpec spec ; @@ -1811,7 +1784,7 @@ bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) return true ; } -bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) +bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) { FInfo fndrInfo ; FSSpec spec ; @@ -1835,7 +1808,7 @@ bool wxFileName::MacSetDefaultTypeAndCreator() return false; } -bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator ) +bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator ) { MacEnsureDefaultExtensionsLoaded() ; wxString extl = ext.Lower() ;