X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91b4bd63177025704dd39679a2a7c4198eeb7909..150c8d89c7f5e04045e55391b34167f2c4165b8b:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 6e4fe199f6..c9a32ea669 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -82,7 +82,7 @@ #include "wx/config.h" // for wxExpandEnvVars #include "wx/utils.h" #include "wx/file.h" -//#include "wx/dynlib.h" // see GetLongPath below, code disabled. +#include "wx/dynlib.h" // For GetShort/LongPathName #ifdef __WIN32__ @@ -124,6 +124,10 @@ #endif #endif +#ifdef __EMX__ +#define MAX_PATH _MAX_PATH +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -135,23 +139,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")); } } @@ -187,36 +199,77 @@ 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__ +// return a string with the volume par +static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format) +{ + wxString path; + + if ( !volume.empty() ) + { + format = wxFileName::GetFormat(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 && volume.length() > 1 ) + { + path << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << volume; + } + else if ( format == wxPATH_DOS || format == wxPATH_VMS ) + { + path << volume << wxFileName::GetVolumeSeparator(format); + } + // else ignore + } + + return path; +} + // ============================================================================ // implementation // ============================================================================ @@ -231,7 +284,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, @@ -249,19 +302,21 @@ void wxFileName::Assign(const wxString& volume, void wxFileName::SetPath( const wxString &path, wxPathFormat format ) { - wxPathFormat my_format = GetFormat( format ); - wxString my_path = path; - 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 @@ -273,18 +328,23 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) // 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; @@ -314,7 +374,7 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) } } } - else + else // no path at all { m_relative = TRUE; } @@ -338,7 +398,7 @@ void wxFileName::Assign(const wxString& fullpathOrig, wxString fullpath = fullpathOrig; if ( !wxEndsWithPathSeparator(fullpath) ) { - fullpath += GetPathSeparators(format)[0u]; + fullpath += GetPathSeparator(format); } wxString volume, path, name, ext; @@ -378,6 +438,9 @@ void wxFileName::Clear() m_volume = m_name = m_ext = wxEmptyString; + + // we don't have any absolute path for now + m_relative = TRUE; } /* static */ @@ -398,7 +461,7 @@ wxFileName wxFileName::DirName(const wxString& dir) // existence tests // ---------------------------------------------------------------------------- -bool wxFileName::FileExists() +bool wxFileName::FileExists() const { return wxFileName::FileExists( GetFullPath() ); } @@ -408,7 +471,7 @@ bool wxFileName::FileExists( const wxString &file ) return ::wxFileExists( file ); } -bool wxFileName::DirExists() +bool wxFileName::DirExists() const { return wxFileName::DirExists( GetFullPath() ); } @@ -510,6 +573,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)) ) { @@ -576,9 +645,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 @@ -587,6 +658,8 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) } else // mkstemp() succeeded { + path = wxConvFile.cMB2WX( (const char*) buf ); + // avoid leaking the fd if ( fileTemp ) { @@ -603,10 +676,15 @@ 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__ @@ -675,47 +753,48 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) // directory operations // ---------------------------------------------------------------------------- -bool wxFileName::Mkdir( int perm, bool full ) +bool wxFileName::Mkdir( int perm, int flags ) { - return wxFileName::Mkdir( GetFullPath(), perm, full ); + return wxFileName::Mkdir( GetFullPath(), perm, flags ); } -bool wxFileName::Mkdir( const wxString &dir, int perm, bool full ) +bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) { - if (full) + if ( flags & wxPATH_MKDIR_FULL ) { - wxFileName filename(dir); - wxArrayString dirs = filename.GetDirs(); - dirs.Add(filename.GetName()); + // split the path in components + wxFileName filename; + filename.AssignDir(dir); - size_t count = dirs.GetCount(); - size_t i; wxString currPath; - int noErrors = 0; - for ( i = 0; i < count; i++ ) + if ( filename.HasVolume()) { - currPath += dirs[i]; + currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE); + } - if (currPath.Last() == wxT(':')) - { - // Can't create a root directory so continue to next dir + wxArrayString dirs = filename.GetDirs(); + size_t count = dirs.GetCount(); + for ( size_t i = 0; i < count; i++ ) + { + if ( i > 0 || filename.IsAbsolute() ) currPath += wxFILE_SEP_PATH; - continue; - } + currPath += dirs[i]; if (!DirExists(currPath)) + { if (!wxMkdir(currPath, perm)) - noErrors ++; - - if ( (i < (count-1)) ) - currPath += wxFILE_SEP_PATH; + { + // no need to try creating further directories + return FALSE; + } + } } - return (noErrors == 0); + return TRUE; } - else - return ::wxMkdir( dir, perm ); + + return ::wxMkdir( dir, perm ); } bool wxFileName::Rmdir() @@ -732,7 +811,7 @@ bool wxFileName::Rmdir( const wxString &dir ) // path normalization // ---------------------------------------------------------------------------- -bool wxFileName::Normalize(wxPathNormalize flags, +bool wxFileName::Normalize(int flags, const wxString& cwd, wxPathFormat format) { @@ -745,7 +824,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() ) { @@ -756,7 +835,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 @@ -764,14 +842,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 @@ -852,6 +928,11 @@ bool wxFileName::Normalize(wxPathNormalize 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) ) { @@ -862,14 +943,36 @@ bool wxFileName::Normalize(wxPathNormalize flags, 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; +} + bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) { wxFileName fnBase(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); @@ -898,6 +1001,17 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) m_dirs.Insert(wxT(".."), 0u); } + if ( format == wxPATH_UNIX || format == wxPATH_DOS ) + { + // a directory made relative with respect to itself is '.' under Unix + // and DOS, by definition (but we don't have to insert "./" for the + // files) + if ( m_dirs.IsEmpty() && IsDir() ) + { + m_dirs.Add(_T('.')); + } + } + m_relative = TRUE; // we were modified @@ -908,15 +1022,15 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) // 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; @@ -991,14 +1105,6 @@ bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format) return GetPathSeparators(format).Find(ch) != wxNOT_FOUND; } -bool wxFileName::IsWild( wxPathFormat 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; -} - // ---------------------------------------------------------------------------- // path components manipulation // ---------------------------------------------------------------------------- @@ -1043,128 +1149,53 @@ wxString wxFileName::GetFullName() const return fullname; } -wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const +wxString wxFileName::GetPath( int flags, wxPathFormat format ) const { format = GetFormat( format ); wxString fullpath; - // the leading character - if ( format == wxPATH_MAC && m_relative ) - { - fullpath += wxFILE_SEP_PATH_MAC; - } - else if ( format == wxPATH_DOS ) + // return the volume with the path as well if requested + if ( flags & wxPATH_GET_VOLUME ) { - if (!m_relative) - fullpath += wxFILE_SEP_PATH_DOS; - } - else if ( format == wxPATH_UNIX ) - { - if (!m_relative) - fullpath += wxFILE_SEP_PATH_UNIX; + fullpath += wxGetVolumeString(GetVolume(), format); } - // then concatenate all the path components using the path separator - size_t dirCount = m_dirs.GetCount(); - if ( dirCount ) + // the leading character + switch ( format ) { - if ( format == wxPATH_VMS ) - { - fullpath += wxT('['); - } + case wxPATH_MAC: + if ( m_relative ) + fullpath += wxFILE_SEP_PATH_MAC; + break; + 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: - { - 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: + // 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('~') ) { - wxFAIL_MSG( wxT("error") ); + fullpath += wxFILE_SEP_PATH_UNIX; } } - } - } - - - - return fullpath; -} - -wxString wxFileName::GetFullPath( wxPathFormat format ) const -{ - format = GetFormat(format); - - wxString fullpath; - - // 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); - } - // else ignore - } - } + break; - // the leading character - if ( format == wxPATH_MAC && 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) - 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 @@ -1176,53 +1207,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; @@ -1264,14 +1303,16 @@ wxString wxFileName::GetLongPath() const #if defined(__WIN32__) && !defined(__WXMICROWIN__) bool success = FALSE; - // VZ: this code was disabled, why? -#if 0 // wxUSE_DYNAMIC_LOADER - typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); +#if wxUSE_DYNAMIC_LOADER + typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); static bool s_triedToLoad = FALSE; if ( !s_triedToLoad ) { + // suppress the errors about missing GetLongPathName[AW] + wxLogNull noLog; + s_triedToLoad = TRUE; wxDynamicLibrary dllKernel(_T("kernel32")); if ( dllKernel.IsLoaded() ) @@ -1309,6 +1350,7 @@ wxString wxFileName::GetLongPath() const } } } + if (success) return pathOut; #endif // wxUSE_DYNAMIC_LOADER @@ -1320,7 +1362,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()); @@ -1338,7 +1386,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 @@ -1350,8 +1399,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; @@ -1549,9 +1602,9 @@ void wxFileName::SplitPath(const wxString& fullpath, wxString volume; SplitPath(fullpath, &volume, path, name, ext, format); - if ( path && !volume.empty() ) + if ( path ) { - path->Prepend(volume + GetVolumeSeparator(format)); + path->Prepend(wxGetVolumeString(volume, format)); } } @@ -1559,11 +1612,40 @@ 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 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 @@ -1575,31 +1657,10 @@ bool wxFileName::SetTimes(const wxDateTime *dtCreate, 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()); - 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; - } - } #else // other platform #endif // platforms @@ -1613,7 +1674,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; } @@ -1624,47 +1685,71 @@ 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; - if ( wxStat(GetFullPath(), &stBuf) == 0 ) +#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 ) - dtAccess->Set(stBuf.st_atime); + ConvertFileTimeToWx(dtAccess, ftAccess); if ( dtMod ) - dtMod->Set(stBuf.st_mtime); - if ( dtChange ) - dtChange->Set(stBuf.st_ctime); + ConvertFileTimeToWx(dtMod, ftWrite); return TRUE; } -#elif defined(__WIN32__) - wxFileHandle fh(GetFullPath()); - if ( fh.IsOk() ) +#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) + wxStructStat stBuf; + if ( wxStat( GetFullPath().c_str(), &stBuf) == 0 ) { - FILETIME ftAccess, ftCreate, ftWrite; - - if ( ::GetFileTime(fh, - dtMod ? &ftCreate : NULL, - dtAccess ? &ftAccess : NULL, - dtChange ? &ftWrite : NULL) ) - { - if ( dtMod ) - ConvertFileTimeToWx(dtMod, ftCreate); - if ( dtAccess ) - ConvertFileTimeToWx(dtAccess, ftAccess); - if ( dtChange ) - ConvertFileTimeToWx(dtChange, ftWrite); + if ( dtAccess ) + dtAccess->Set(stBuf.st_atime); + if ( dtMod ) + dtMod->Set(stBuf.st_mtime); + if ( dtCreate ) + dtCreate->Set(stBuf.st_ctime); - return TRUE; - } + return TRUE; } #else // other platform #endif // platforms @@ -1678,41 +1763,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( const 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 ) + + for ( size_t 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 ; @@ -1726,7 +1834,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 ; @@ -1750,7 +1858,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() ; @@ -1776,4 +1884,3 @@ void wxFileName::MacRegisterDefaultTypeAndCreator( const wxString& ext , wxUint3 gMacDefaultExtensions.Add( rec ) ; } #endif -