X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df22f86063643de23dd02c2a77217d07b1918be1..b1699cd397f7db0193491c8498608578b43db12b:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 397171c470..bc37751bbf 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,61 @@ // ---------------------------------------------------------------------------- #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 +#include "wx/msw/winundef.h" +#endif - #include "wx/msw/winundef.h" +#if defined(__WXMAC__) + #include "wx/mac/private.h" // includes mac headers #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__ @@ -129,23 +135,31 @@ class wxFileHandle { public: - wxFileHandle(const wxString& filename) + enum OpenMode + { + Read, + Write + }; + + wxFileHandle(const wxString& filename, OpenMode mode) { m_hFile = ::CreateFile ( - filename, // name - GENERIC_READ, // access mask - 0, // no sharing - NULL, // no secutity attr - OPEN_EXISTING, // creation disposition - 0, // no flags - NULL // no template file + filename, // name + mode == Read ? GENERIC_READ // access mask + : GENERIC_WRITE, + 0, // no sharing + NULL, // no secutity attr + OPEN_EXISTING, // creation disposition + 0, // no flags + NULL // no template file ); if ( m_hFile == INVALID_HANDLE_VALUE ) { - wxLogSysError(_("Failed to open '%s' for reading"), - filename.c_str()); + wxLogSysError(_("Failed to open '%s' for %s"), + filename.c_str(), + mode == Read ? _("reading") : _("writing")); } } @@ -181,32 +195,46 @@ private: // convert between wxDateTime and FILETIME which is a 64-bit value representing // the number of 100-nanosecond intervals since January 1, 1601. -// the number of milliseconds between the Unix Epoch (January 1, 1970) and the -// FILETIME reference point (January 1, 1601) -static const wxLongLong FILETIME_EPOCH_OFFSET = wxLongLong(0xa97, 0x30b66800); - static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft) { - wxLongLong ll(ft.dwHighDateTime, ft.dwLowDateTime); - - // convert 100ns to ms - ll /= 10000; + FILETIME ftcopy = ft; + FILETIME ftLocal; + if ( !::FileTimeToLocalFileTime(&ftcopy, &ftLocal) ) + { + wxLogLastError(_T("FileTimeToLocalFileTime")); + } - // move it to our Epoch - ll -= FILETIME_EPOCH_OFFSET; + SYSTEMTIME st; + if ( !::FileTimeToSystemTime(&ftLocal, &st) ) + { + wxLogLastError(_T("FileTimeToSystemTime")); + } - *dt = wxDateTime(ll); + dt->Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear, + st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); } static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt) { - // do the reverse of ConvertFileTimeToWx() - wxLongLong ll = dt.GetValue(); - ll *= 10000; - ll += FILETIME_EPOCH_OFFSET; + SYSTEMTIME st; + st.wDay = dt.GetDay(); + st.wMonth = dt.GetMonth() + 1; + st.wYear = dt.GetYear(); + st.wHour = dt.GetHour(); + st.wMinute = dt.GetMinute(); + st.wSecond = dt.GetSecond(); + st.wMilliseconds = dt.GetMillisecond(); + + FILETIME ftLocal; + if ( !::SystemTimeToFileTime(&st, &ftLocal) ) + { + wxLogLastError(_T("SystemTimeToFileTime")); + } - ft->dwHighDateTime = ll.GetHi(); - ft->dwLowDateTime = ll.GetLo(); + if ( !::LocalFileTimeToFileTime(&ftLocal, ft) ) + { + wxLogLastError(_T("LocalFileTimeToFileTime")); + } } #endif // __WIN32__ @@ -225,7 +253,7 @@ void wxFileName::Assign( const wxFileName &filepath ) m_dirs = filepath.GetDirs(); m_name = filepath.GetName(); m_ext = filepath.GetExt(); - m_relative = filepath.IsRelative(); + m_relative = filepath.m_relative; } void wxFileName::Assign(const wxString& volume, @@ -234,23 +262,34 @@ void wxFileName::Assign(const wxString& volume, const wxString& ext, wxPathFormat format ) { - wxPathFormat my_format = GetFormat( format ); - wxString my_path = path; - + SetPath( path, format ); + + m_volume = volume; + m_ext = ext; + m_name = name; +} + +void wxFileName::SetPath( const wxString &path, wxPathFormat format ) +{ m_dirs.Clear(); - - if (!my_path.empty()) + + if ( !path.empty() ) { + wxPathFormat my_format = GetFormat( format ); + wxString my_path = path; + // 1) Determine if the path is relative or absolute. - + wxChar leadingChar = my_path[0u]; + switch (my_format) { case wxPATH_MAC: - m_relative = ( my_path[0u] == wxT(':') ); + m_relative = leadingChar == wxT(':'); + // 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) @@ -258,27 +297,32 @@ void wxFileName::Assign(const wxString& volume, // actually means , whereas under DOS, double // slashes can be ignored: "\\\\" is the same as "\\". if (m_relative) - my_path.Remove( 0, 1 ); + my_path.erase( 0, 1 ); break; + case wxPATH_VMS: // TODO: what is the relative path format here? m_relative = FALSE; break; + case wxPATH_UNIX: - m_relative = ( my_path[0u] != wxT('/') ); + // the paths of the form "~" or "~username" are absolute + m_relative = leadingChar != wxT('/') && leadingChar != _T('~'); break; + case wxPATH_DOS: - m_relative = ( (my_path[0u] != wxT('/')) && (my_path[0u] != wxT('\\')) ); + 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 // 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 +343,10 @@ void wxFileName::Assign(const wxString& volume, } } } - - m_volume = volume; - m_ext = ext; - m_name = name; + else // no path at all + { + m_relative = TRUE; + } } void wxFileName::Assign(const wxString& fullpath, @@ -344,7 +388,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__ @@ -495,6 +539,12 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) dir = _T('.'); } } + else // we have a dir to create the file in + { + // ensure we use only the back slashes as GetTempFileName(), unlike all + // the other APIs, is picky and doesn't accept the forward ones + dir.Replace(_T("/"), _T("\\")); + } if ( !::GetTempFileName(dir, name, 0, wxStringBuffer(path, MAX_PATH + 1)) ) { @@ -522,12 +572,15 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) #ifndef __WATCOMC__ ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL); #endif - + #else // !Windows, !OS/2 if ( dir.empty() ) { +#if defined(__WXMAC__) && !defined(__DARWIN__) + dir = wxMacFindFolder( (short) kOnSystemDisk, kTemporaryFolderType, kCreateFolder ) ; +#else // !Mac dir = wxGetenv(_T("TMP")); - if ( path.empty() ) + if ( dir.empty() ) { dir = wxGetenv(_T("TEMP")); } @@ -536,11 +589,12 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) { // default #ifdef __DOS__ - dir = _T("."); + dir = _T("."); #else - dir = _T("/tmp"); + dir = _T("/tmp"); #endif } +#endif // Mac/!Mac } path = dir; @@ -627,7 +681,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) @@ -704,7 +767,7 @@ bool wxFileName::Rmdir( const wxString &dir ) // path normalization // ---------------------------------------------------------------------------- -bool wxFileName::Normalize(wxPathNormalize flags, +bool wxFileName::Normalize(int flags, const wxString& cwd, wxPathFormat format) { @@ -717,7 +780,7 @@ bool wxFileName::Normalize(wxPathNormalize flags, format = GetFormat(format); // make the path absolute - if ( (flags & wxPATH_NORM_ABSOLUTE) && m_relative ) + if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute(format) ) { if ( cwd.empty() ) { @@ -728,7 +791,6 @@ bool wxFileName::Normalize(wxPathNormalize flags, curDir.AssignDir(cwd); } -#if 0 // the path may be not absolute because it doesn't have the volume name // but in this case we shouldn't modify the directory components of it // but just set the current volume @@ -736,14 +798,12 @@ bool wxFileName::Normalize(wxPathNormalize flags, { SetVolume(curDir.GetVolume()); - if ( IsAbsolute() ) + if ( !m_relative ) { // yes, it was the case - we don't need curDir then curDir.Clear(); } } -#endif - m_relative = FALSE; } // handle ~ stuff under Unix only @@ -831,6 +891,31 @@ bool wxFileName::Normalize(wxPathNormalize flags, } #endif // Win32 + // we do have the path now + m_relative = FALSE; + + return TRUE; +} + +// ---------------------------------------------------------------------------- +// absolute/relative paths +// ---------------------------------------------------------------------------- + +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; + + 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 TRUE; } @@ -869,7 +954,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) { m_dirs.Insert(wxT(".."), 0u); } - + m_relative = TRUE; // we were modified @@ -963,11 +1048,10 @@ bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format) return GetPathSeparators(format).Find(ch) != wxNOT_FOUND; } -bool wxFileName::IsWild( wxPathFormat format ) +bool wxFileName::IsWild( wxPathFormat WXUNUSED(format) ) { // FIXME: this is probably false for Mac and this is surely wrong for most // of Unix shells (think about "[...]") - (void)format; return m_name.find_first_of(_T("*?")) != wxString::npos; } @@ -1036,7 +1120,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 ) @@ -1092,7 +1176,10 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const } } - + if ( add_separator && !fullpath.empty() ) + { + fullpath += GetPathSeparators(format)[0u]; + } return fullpath; } @@ -1122,23 +1209,31 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const // else ignore } } - + // the leading character - if ( format == wxPATH_MAC && m_relative ) + if ( format == wxPATH_MAC ) { - fullpath += wxFILE_SEP_PATH_MAC; + if ( m_relative ) + fullpath += wxFILE_SEP_PATH_MAC; } else if ( format == wxPATH_DOS ) { - if (!m_relative) - fullpath += wxFILE_SEP_PATH_DOS; + if ( !m_relative ) + fullpath += wxFILE_SEP_PATH_DOS; } else if ( format == wxPATH_UNIX ) { - if (!m_relative) - fullpath += wxFILE_SEP_PATH_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; + } + } } - + // then concatenate all the path components using the path separator size_t dirCount = m_dirs.GetCount(); if ( dirCount ) @@ -1236,8 +1331,8 @@ wxString wxFileName::GetLongPath() const #if defined(__WIN32__) && !defined(__WXMICROWIN__) bool success = FALSE; - // VZ: this code was disabled, why? -#if 0 // wxUSE_DYNLIB_CLASS + // VZ: why was this code disabled? +#if 0 // wxUSE_DYNAMIC_LOADER typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); static bool s_triedToLoad = FALSE; @@ -1245,19 +1340,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); @@ -1285,7 +1378,7 @@ wxString wxFileName::GetLongPath() const } if (success) return pathOut; -#endif // wxUSE_DYNLIB_CLASS +#endif // wxUSE_DYNAMIC_LOADER if (!success) { @@ -1458,7 +1551,10 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, // the path equal to something like '/', not empty, for the files // immediately under root directory size_t len = posLastSlash; - if ( !len ) + + // this rule does not apply to mac since we do not start with colons (sep) + // except for relative paths + if ( !len && format != wxPATH_MAC) len++; *pstrPath = fullpath.Left(len); @@ -1530,9 +1626,9 @@ void wxFileName::SplitPath(const wxString& fullpath, // time functions // ---------------------------------------------------------------------------- -bool wxFileName::SetTimes(const wxDateTime *dtCreate, - const wxDateTime *dtAccess, - const wxDateTime *dtMod) +bool wxFileName::SetTimes(const wxDateTime *dtAccess, + const wxDateTime *dtMod, + const wxDateTime *dtCreate) { #if defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__)) if ( !dtAccess && !dtMod ) @@ -1551,7 +1647,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtCreate, return TRUE; } #elif defined(__WIN32__) - wxFileHandle fh(GetFullPath()); + wxFileHandle fh(GetFullPath(), wxFileHandle::Write); if ( fh.IsOk() ) { FILETIME ftAccess, ftCreate, ftWrite; @@ -1595,13 +1691,13 @@ bool wxFileName::Touch() #else // other platform wxDateTime dtNow = wxDateTime::Now(); - return SetTimes(NULL /* don't change create time */, &dtNow, &dtNow); + return SetTimes(&dtNow, &dtNow, NULL /* don't change create time */); #endif // platforms } bool wxFileName::GetTimes(wxDateTime *dtAccess, wxDateTime *dtMod, - wxDateTime *dtChange) const + wxDateTime *dtCreate) const { #if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) wxStructStat stBuf; @@ -1611,13 +1707,13 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, dtAccess->Set(stBuf.st_atime); if ( dtMod ) dtMod->Set(stBuf.st_mtime); - if ( dtChange ) - dtChange->Set(stBuf.st_ctime); + if ( dtCreate ) + dtCreate->Set(stBuf.st_ctime); return TRUE; } #elif defined(__WIN32__) - wxFileHandle fh(GetFullPath()); + wxFileHandle fh(GetFullPath(), wxFileHandle::Read); if ( fh.IsOk() ) { FILETIME ftAccess, ftCreate, ftWrite; @@ -1625,14 +1721,14 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, if ( ::GetFileTime(fh, dtMod ? &ftCreate : NULL, dtAccess ? &ftAccess : NULL, - dtChange ? &ftWrite : NULL) ) + dtCreate ? &ftWrite : NULL) ) { if ( dtMod ) ConvertFileTimeToWx(dtMod, ftCreate); if ( dtAccess ) ConvertFileTimeToWx(dtAccess, ftAccess); - if ( dtChange ) - ConvertFileTimeToWx(dtChange, ftWrite); + if ( dtCreate ) + ConvertFileTimeToWx(dtCreate, ftWrite); return TRUE; } @@ -1646,3 +1742,104 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, return FALSE; } +#ifdef __WXMAC__ + +const short kMacExtensionMaxLength = 16 ; +typedef struct +{ + char m_ext[kMacExtensionMaxLength] ; + OSType m_type ; + OSType m_creator ; +} MacDefaultExtensionRecord ; + +#include "wx/dynarray.h" +WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray) ; +#include "wx/arrimpl.cpp" +WX_DEFINE_OBJARRAY(MacDefaultExtensionArray) ; + +MacDefaultExtensionArray gMacDefaultExtensions ; +bool gMacDefaultExtensionsInited = false ; + +static void MacEnsureDefaultExtensionsLoaded() +{ + if ( !gMacDefaultExtensionsInited ) + { + // load the default extensions + MacDefaultExtensionRecord defaults[] = + { + { "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 ) +{ + FInfo fndrInfo ; + FSSpec spec ; + wxMacFilename2FSSpec(GetFullPath(),&spec) ; + OSErr err = FSpGetFInfo( &spec , &fndrInfo ) ; + wxCHECK( err == noErr , false ) ; + + fndrInfo.fdType = type ; + fndrInfo.fdCreator = creator ; + FSpSetFInfo( &spec , &fndrInfo ) ; + return true ; +} + +bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) +{ + FInfo fndrInfo ; + FSSpec spec ; + wxMacFilename2FSSpec(GetFullPath(),&spec) ; + OSErr err = FSpGetFInfo( &spec , &fndrInfo ) ; + wxCHECK( err == noErr , false ) ; + + *type = fndrInfo.fdType ; + *creator = fndrInfo.fdCreator ; + return true ; +} + +bool wxFileName::MacSetDefaultTypeAndCreator() +{ + wxUint32 type , creator ; + if ( wxFileName::MacFindDefaultTypeAndCreator(GetExt() , &type , + &creator ) ) + { + return MacSetTypeAndCreator( type , creator ) ; + } + return false; +} + +bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator ) +{ + MacEnsureDefaultExtensionsLoaded() ; + wxString extl = ext.Lower() ; + for( int i = gMacDefaultExtensions.Count() - 1 ; i >= 0 ; --i ) + { + if ( gMacDefaultExtensions.Item(i).m_ext == extl ) + { + *type = gMacDefaultExtensions.Item(i).m_type ; + *creator = gMacDefaultExtensions.Item(i).m_creator ; + return true ; + } + } + return false ; +} + +void wxFileName::MacRegisterDefaultTypeAndCreator( const wxString& ext , wxUint32 type , wxUint32 creator ) +{ + MacEnsureDefaultExtensionsLoaded() ; + MacDefaultExtensionRecord rec ; + rec.m_type = type ; + rec.m_creator = creator ; + strncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ; + gMacDefaultExtensions.Add( rec ) ; +} +#endif