X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ea621cc259b9a61df64dbf08dd8ddb8c71fe407..86351e4a9d12822b31f2052fe299fc6be6d5f44d:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index a7409aa0c8..5a125fcd3f 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -6,7 +6,7 @@ // Created: 28.12.2000 // RCS-ID: $Id$ // Copyright: (c) 2000 Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /* @@ -60,7 +60,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "filename.h" #endif @@ -86,8 +86,11 @@ // For GetShort/LongPathName #ifdef __WIN32__ -#include -#include "wx/msw/winundef.h" +#include "wx/msw/wrapwin.h" +#endif + +#ifdef __WXWINCE__ +#include "wx/msw/private.h" #endif #if defined(__WXMAC__) @@ -107,10 +110,17 @@ #endif #ifdef __MWERKS__ +#ifdef __MACH__ +#include +#include +#include +#include +#else #include #include #include #endif +#endif #ifdef __WATCOMC__ #include @@ -124,6 +134,11 @@ #endif #endif +#ifdef __EMX__ +#include +#define MAX_PATH _MAX_PATH +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -174,7 +189,7 @@ public: } } - // return TRUE only if the file could be opened successfully + // return true only if the file could be opened successfully bool IsOk() const { return m_hFile != INVALID_HANDLE_VALUE; } // get the handle @@ -190,7 +205,7 @@ private: // private functions // ---------------------------------------------------------------------------- -#if defined(__WIN32__) && !defined(__WXMICROWIN__) +#if wxUSE_DATETIME && defined(__WIN32__) && !defined(__WXMICROWIN__) // convert between wxDateTime and FILETIME which is a 64-bit value representing // the number of 100-nanosecond intervals since January 1, 1601. @@ -237,7 +252,7 @@ static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt) } } -#endif // __WIN32__ +#endif // wxUSE_DATETIME && __WIN32__ // return a string with the volume par static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format) @@ -329,9 +344,13 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) case wxPATH_VMS: // TODO: what is the relative path format here? - m_relative = FALSE; + m_relative = false; break; + default: + wxFAIL_MSG( _T("Unknown path format") ); + // !! Fall through !! + case wxPATH_UNIX: // the paths of the form "~" or "~username" are absolute m_relative = leadingChar != wxT('/') && leadingChar != _T('~'); @@ -341,9 +360,6 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) m_relative = !IsPathSeparator(leadingChar, my_format); break; - default: - wxFAIL_MSG( wxT("error") ); - break; } // 2) Break up the path into its members. If the original path @@ -372,7 +388,7 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) } else // no path at all { - m_relative = TRUE; + m_relative = true; } } @@ -434,19 +450,22 @@ void wxFileName::Clear() m_volume = m_name = m_ext = wxEmptyString; + + // we don't have any absolute path for now + m_relative = true; } /* static */ -wxFileName wxFileName::FileName(const wxString& file) +wxFileName wxFileName::FileName(const wxString& file, wxPathFormat format) { - return wxFileName(file); + return wxFileName(file, format); } /* static */ -wxFileName wxFileName::DirName(const wxString& dir) +wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format) { wxFileName fn; - fn.AssignDir(dir); + fn.AssignDir(dir, format); return fn; } @@ -454,7 +473,7 @@ wxFileName wxFileName::DirName(const wxString& dir) // existence tests // ---------------------------------------------------------------------------- -bool wxFileName::FileExists() +bool wxFileName::FileExists() const { return wxFileName::FileExists( GetFullPath() ); } @@ -464,7 +483,7 @@ bool wxFileName::FileExists( const wxString &file ) return ::wxFileExists( file ); } -bool wxFileName::DirExists() +bool wxFileName::DirExists() const { return wxFileName::DirExists( GetFullPath() ); } @@ -550,8 +569,22 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) // use the directory specified by the prefix SplitPath(prefix, &dir, &name, NULL /* extension */); -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) +#if defined(__WXWINCE__) + if (dir.empty()) + { + // FIXME. Create \temp dir? + dir = wxT("\\"); + } + path = dir + wxT("\\") + prefix; + int i = 1; + while (wxFileExists(path)) + { + path = dir + wxT("\\") + prefix ; + path << i; + i ++; + } +#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__) #ifdef __WIN32__ if ( dir.empty() ) { @@ -638,9 +671,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( wxConvFile.cWX2MB( path ) ); + + // cast is safe because the string length doesn't change + int fdTemp = mkstemp( (char*)(const char*) buf ); if ( fdTemp == -1 ) { // this might be not necessary as mkstemp() on most systems should have @@ -649,6 +684,8 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) } else // mkstemp() succeeded { + path = wxConvFile.cMB2WX( (const char*) buf ); + // avoid leaking the fd if ( fileTemp ) { @@ -665,13 +702,18 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) // same as above path += _T("XXXXXX"); - if ( !mktemp((char *)path.mb_str()) ) + wxCharBuffer buf = wxConvFile.cWX2MB( path ); + if ( !mktemp( (const char*) buf ) ) { path.clear(); } + else + { + path = wxConvFile.cMB2WX( (const char*) buf ); + } #else // !HAVE_MKTEMP (includes __DOS__) // generate the unique file name ourselves - #ifndef __DOS__ + #if !defined(__DOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) ) path << (unsigned int)getpid(); #endif @@ -760,7 +802,14 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) size_t count = dirs.GetCount(); for ( size_t i = 0; i < count; i++ ) { - if ( i > 0 || filename.IsAbsolute() ) + if ( i > 0 || +#if defined(__WXMAC__) && !defined(__DARWIN__) + // relative pathnames are exactely the other way round under mac... + !filename.IsAbsolute() +#else + filename.IsAbsolute() +#endif + ) currPath += wxFILE_SEP_PATH; currPath += dirs[i]; @@ -769,12 +818,12 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) if (!wxMkdir(currPath, perm)) { // no need to try creating further directories - return FALSE; + return false; } } } - return TRUE; + return true; } @@ -883,7 +932,7 @@ bool wxFileName::Normalize(int flags, { wxLogError(_("The path '%s' contains too many \"..\"!"), GetFullPath().c_str()); - return FALSE; + return false; } m_dirs.RemoveAt(m_dirs.GetCount() - 1); @@ -912,6 +961,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,10 +973,7 @@ bool wxFileName::Normalize(int flags, } #endif // Win32 - // we do have the path now - m_relative = FALSE; - - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -934,27 +985,27 @@ bool wxFileName::IsAbsolute(wxPathFormat format) const // if our path doesn't start with a path separator, it's not an absolute // path if ( m_relative ) - return FALSE; + return false; if ( !GetVolumeSeparator(format).empty() ) { // this format has volumes and an absolute path must have one, it's not // enough to have the full path to bean absolute file under Windows if ( GetVolume().empty() ) - return FALSE; + return false; } - return TRUE; + return true; } bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) { - wxFileName fnBase(pathBase, format); + wxFileName fnBase = wxFileName::DirName(pathBase, format); // get cwd only once - small time saving wxString cwd = wxGetCwd(); - Normalize(wxPATH_NORM_ALL, cwd, format); - fnBase.Normalize(wxPATH_NORM_ALL, cwd, format); + Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format); + fnBase.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format); bool withCase = IsCaseSensitive(format); @@ -962,7 +1013,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) ) { // nothing done - return FALSE; + return false; } // same drive, so we don't need our volume @@ -994,33 +1045,33 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) } } - m_relative = TRUE; + m_relative = true; // we were modified - return TRUE; + return true; } // ---------------------------------------------------------------------------- // filename kind tests // ---------------------------------------------------------------------------- -bool wxFileName::SameAs(const wxFileName &filepath, wxPathFormat format) +bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const { wxFileName fn1 = *this, fn2 = filepath; // get cwd only once - small time saving wxString cwd = wxGetCwd(); - fn1.Normalize(wxPATH_NORM_ALL, cwd, format); - fn2.Normalize(wxPATH_NORM_ALL, cwd, format); + fn1.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format); + fn2.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format); if ( fn1.GetFullPath() == fn2.GetFullPath() ) - return TRUE; + return true; // TODO: compare inodes for Unix, this works even when filenames are // different but files are the same (symlinks) (VZ) - return FALSE; + return false; } /* static */ @@ -1030,6 +1081,41 @@ bool wxFileName::IsCaseSensitive( wxPathFormat format ) return GetFormat(format) == wxPATH_UNIX; } +/* static */ +wxString wxFileName::GetForbiddenChars(wxPathFormat format) +{ + // Inits to forbidden characters that are common to (almost) all platforms. + wxString strForbiddenChars = wxT("*?"); + + // If asserts, wxPathFormat has been changed. In case of a new path format + // addition, the following code might have to be updated. + wxCOMPILE_TIME_ASSERT(wxPATH_MAX == 5, wxPathFormatChanged); + switch ( GetFormat(format) ) + { + default : + wxFAIL_MSG( wxT("Unknown path format") ); + // !! Fall through !! + + case wxPATH_UNIX: + break; + + case wxPATH_MAC: + // On a Mac even names with * and ? are allowed (Tested with OS + // 9.2.1 and OS X 10.2.5) + strForbiddenChars = wxEmptyString; + break; + + case wxPATH_DOS: + strForbiddenChars += wxT("\\/:\"<>|"); + break; + + case wxPATH_VMS: + break; + } + + return strForbiddenChars; +} + /* static */ wxString wxFileName::GetVolumeSeparator(wxPathFormat format) { @@ -1058,7 +1144,7 @@ wxString wxFileName::GetPathSeparators(wxPathFormat format) break; default: - wxFAIL_MSG( _T("unknown wxPATH_XXX style") ); + wxFAIL_MSG( _T("Unknown wxPATH_XXX style") ); // fall through case wxPATH_UNIX: @@ -1108,7 +1194,7 @@ void wxFileName::InsertDir( int before, const wxString &dir ) void wxFileName::RemoveDir( int pos ) { - m_dirs.Remove( (size_t)pos ); + m_dirs.RemoveAt( (size_t)pos ); } // ---------------------------------------------------------------------------- @@ -1144,27 +1230,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 ) + switch ( format ) { - 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('~') ) + case wxPATH_MAC: + if ( m_relative ) + fullpath += wxFILE_SEP_PATH_MAC; + break; + + case wxPATH_DOS: + if (!m_relative) + fullpath += wxFILE_SEP_PATH_DOS; + break; + + default: + wxFAIL_MSG( wxT("Unknown path format") ); + // fall through + + case wxPATH_UNIX: + if ( !m_relative ) { - fullpath += wxFILE_SEP_PATH_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 += wxFILE_SEP_PATH_UNIX; + } } - } + break; + + 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 @@ -1194,7 +1293,7 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const break; default: - wxFAIL_MSG( wxT("unexpected path format") ); + wxFAIL_MSG( wxT("Unexpected path format") ); // still fall through case wxPATH_DOS: @@ -1204,13 +1303,14 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const case wxPATH_VMS: // TODO: What to do with ".." under VMS + // convert back from ".." to nothing if ( m_dirs[i] != wxT("..") ) fullpath += m_dirs[i]; break; } - if ( i != dirCount - 1 ) + if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) ) fullpath += GetPathSeparator(format); } @@ -1220,11 +1320,6 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const } } - if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() ) - { - fullpath += GetPathSeparator(format); - } - return fullpath; } @@ -1243,7 +1338,7 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const // Return the short form of the path (returns identity on non-Windows platforms) wxString wxFileName::GetShortPath() const { -#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) +#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) wxString path(GetFullPath()); wxString pathOut; DWORD sz = ::GetShortPathName(path, NULL, 0); @@ -1253,10 +1348,9 @@ wxString wxFileName::GetShortPath() const ok = ::GetShortPathName ( path, - pathOut.GetWriteBuf(sz), + wxStringBuffer(pathOut, sz), sz ) != 0; - pathOut.UngetWriteBuf(); } if (ok) return pathOut; @@ -1274,16 +1368,19 @@ wxString wxFileName::GetLongPath() const path = GetFullPath(); #if defined(__WIN32__) && !defined(__WXMICROWIN__) - bool success = FALSE; + bool success = false; #if wxUSE_DYNAMIC_LOADER typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); - static bool s_triedToLoad = FALSE; + static bool s_triedToLoad = false; if ( !s_triedToLoad ) { - s_triedToLoad = TRUE; + // suppress the errors about missing GetLongPathName[AW] + wxLogNull noLog; + + s_triedToLoad = true; wxDynamicLibrary dllKernel(_T("kernel32")); if ( dllKernel.IsLoaded() ) { @@ -1309,17 +1406,16 @@ wxString wxFileName::GetLongPath() const ok = (*s_pfnGetLongPathName) ( path, - pathOut.GetWriteBuf(sz), + wxStringBuffer(pathOut, sz), sz ) != 0; - pathOut.UngetWriteBuf(); - - success = TRUE; + success = true; } } } } } + if (success) return pathOut; #endif // wxUSE_DYNAMIC_LOADER @@ -1331,7 +1427,13 @@ wxString wxFileName::GetLongPath() const WIN32_FIND_DATA findFileData; HANDLE hFind; - pathOut = wxEmptyString; + + if ( HasVolume() ) + pathOut = GetVolume() + + GetVolumeSeparator(wxPATH_DOS) + + GetPathSeparator(wxPATH_DOS); + else + pathOut = wxEmptyString; wxArrayString dirs = GetDirs(); dirs.Add(GetFullName()); @@ -1349,7 +1451,8 @@ wxString wxFileName::GetLongPath() const if ( tmpPath.empty() ) continue; - if ( tmpPath.Last() == wxT(':') ) + // can't see this being necessary? MF + if ( tmpPath.Last() == GetVolumeSeparator(wxPATH_DOS) ) { // Can't pass a drive and root dir to FindFirstFile, // so continue to next dir @@ -1361,8 +1464,12 @@ wxString wxFileName::GetLongPath() const hFind = ::FindFirstFile(tmpPath, &findFileData); if (hFind == INVALID_HANDLE_VALUE) { - // Error: return immediately with the original path - return path; + // Error: most likely reason is that path doesn't exist, so + // append any unprocessed parts and return + for ( i += 1; i < count; i++ ) + tmpPath += wxFILE_SEP_PATH + dirs[i]; + + return tmpPath; } pathOut += findFileData.cFileName; @@ -1432,7 +1539,7 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, fullpath[posFirstSlash] = wxFILE_SEP_DSK; // UNC paths are always absolute, right? (FIXME) - fullpath.insert(posFirstSlash + 1, wxFILE_SEP_PATH_DOS); + fullpath.insert(posFirstSlash + 1, 1, wxFILE_SEP_PATH_DOS); } } } @@ -1570,15 +1677,46 @@ void wxFileName::SplitPath(const wxString& fullpath, // time functions // ---------------------------------------------------------------------------- +#if wxUSE_DATETIME + bool wxFileName::SetTimes(const wxDateTime *dtAccess, const wxDateTime *dtMod, const wxDateTime *dtCreate) { -#if defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__)) +#if defined(__WIN32__) + if ( IsDir() ) + { + // VZ: please let me know how to do this if you can + wxFAIL_MSG( _T("SetTimes() not implemented for the directories") ); + } + else // file + { + wxFileHandle fh(GetFullPath(), wxFileHandle::Write); + if ( fh.IsOk() ) + { + FILETIME ftAccess, ftCreate, ftWrite; + + if ( dtCreate ) + ConvertWxToFileTime(&ftCreate, *dtCreate); + if ( dtAccess ) + ConvertWxToFileTime(&ftAccess, *dtAccess); + if ( dtMod ) + ConvertWxToFileTime(&ftWrite, *dtMod); + + if ( ::SetFileTime(fh, + dtCreate ? &ftCreate : NULL, + dtAccess ? &ftAccess : NULL, + dtMod ? &ftWrite : NULL) ) + { + return true; + } + } + } +#elif defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__)) if ( !dtAccess && !dtMod ) { // can't modify the creation time anyhow, don't try - return TRUE; + return true; } // if dtAccess or dtMod is not specified, use the other one (which must be @@ -1586,30 +1724,9 @@ 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; - } -#elif defined(__WIN32__) - wxFileHandle fh(GetFullPath(), wxFileHandle::Write); - if ( fh.IsOk() ) - { - FILETIME ftAccess, ftCreate, ftWrite; - - if ( dtCreate ) - ConvertWxToFileTime(&ftCreate, *dtCreate); - if ( dtAccess ) - ConvertWxToFileTime(&ftAccess, *dtAccess); - if ( dtMod ) - ConvertWxToFileTime(&ftWrite, *dtMod); - - if ( ::SetFileTime(fh, - dtCreate ? &ftCreate : NULL, - dtAccess ? &ftAccess : NULL, - dtMod ? &ftWrite : NULL) ) - { - return TRUE; - } + return true; } #else // other platform #endif // platforms @@ -1617,21 +1734,21 @@ bool wxFileName::SetTimes(const wxDateTime *dtAccess, wxLogSysError(_("Failed to modify file times for '%s'"), GetFullPath().c_str()); - return FALSE; + return false; } 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; + return true; } wxLogSysError(_("Failed to touch the file '%s'"), GetFullPath().c_str()); - return FALSE; + return false; #else // other platform wxDateTime dtNow = wxDateTime::Now(); @@ -1643,9 +1760,54 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, wxDateTime *dtMod, wxDateTime *dtCreate) const { -#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) +#if defined(__WIN32__) + // we must use different methods for the files and directories under + // Windows as CreateFile(GENERIC_READ) doesn't work for the directories and + // CreateFile(FILE_FLAG_BACKUP_SEMANTICS) works -- but only under NT and + // not 9x + bool ok; + FILETIME ftAccess, ftCreate, ftWrite; + if ( IsDir() ) + { + // implemented in msw/dir.cpp + extern bool wxGetDirectoryTimes(const wxString& dirname, + FILETIME *, FILETIME *, FILETIME *); + + // we should pass the path without the trailing separator to + // wxGetDirectoryTimes() + ok = wxGetDirectoryTimes(GetPath(wxPATH_GET_VOLUME), + &ftAccess, &ftCreate, &ftWrite); + } + else // file + { + wxFileHandle fh(GetFullPath(), wxFileHandle::Read); + if ( fh.IsOk() ) + { + ok = ::GetFileTime(fh, + dtCreate ? &ftCreate : NULL, + dtAccess ? &ftAccess : NULL, + dtMod ? &ftWrite : NULL) != 0; + } + else + { + ok = false; + } + } + + if ( ok ) + { + if ( dtCreate ) + ConvertFileTimeToWx(dtCreate, ftCreate); + if ( dtAccess ) + ConvertFileTimeToWx(dtAccess, ftAccess); + if ( dtMod ) + ConvertFileTimeToWx(dtMod, ftWrite); + + return true; + } +#elif 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); @@ -1654,28 +1816,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, if ( dtCreate ) dtCreate->Set(stBuf.st_ctime); - return TRUE; - } -#elif defined(__WIN32__) - wxFileHandle fh(GetFullPath(), wxFileHandle::Read); - if ( fh.IsOk() ) - { - FILETIME ftAccess, ftCreate, ftWrite; - - if ( ::GetFileTime(fh, - dtMod ? &ftCreate : NULL, - dtAccess ? &ftAccess : NULL, - dtCreate ? &ftWrite : NULL) ) - { - if ( dtMod ) - ConvertFileTimeToWx(dtMod, ftCreate); - if ( dtAccess ) - ConvertFileTimeToWx(dtAccess, ftAccess); - if ( dtCreate ) - ConvertFileTimeToWx(dtCreate, ftWrite); - - return TRUE; - } + return true; } #else // other platform #endif // platforms @@ -1683,40 +1824,65 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, wxLogSysError(_("Failed to retrieve file times for '%s'"), GetFullPath().c_str()); - return FALSE; + return false; } +#endif // wxUSE_DATETIME + #ifdef __WXMAC__ const short kMacExtensionMaxLength = 16 ; -typedef struct +class MacDefaultExtensionRecord { - char m_ext[kMacExtensionMaxLength] ; +public : + MacDefaultExtensionRecord() + { + m_ext[0] = 0 ; + m_type = m_creator = NULL ; + } + MacDefaultExtensionRecord( const MacDefaultExtensionRecord& from ) + { + wxStrcpy( m_ext , from.m_ext ) ; + m_type = from.m_type ; + m_creator = from.m_creator ; + } + MacDefaultExtensionRecord( const wxChar * extension , OSType type , OSType creator ) + { + wxStrncpy( m_ext , extension , kMacExtensionMaxLength ) ; + m_ext[kMacExtensionMaxLength] = 0 ; + m_type = type ; + m_creator = creator ; + } + wxChar 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( wxT("txt") , 'TEXT' , 'ttxt' ) , } ; // we could load the pc exchange prefs here too - for ( int i = 0 ; i < WXSIZEOF( defaults ) ; ++i ) + for ( size_t i = 0 ; i < WXSIZEOF( defaults ) ; ++i ) { gMacDefaultExtensions.Add( defaults[i] ) ; } @@ -1783,7 +1949,7 @@ void wxFileName::MacRegisterDefaultTypeAndCreator( const wxString& ext , wxUint3 MacDefaultExtensionRecord rec ; rec.m_type = type ; rec.m_creator = creator ; - strncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ; + wxStrncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ; gMacDefaultExtensions.Add( rec ) ; } #endif