X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52dbd056d2089310d4957e7dbf7ab3efd81913f2..4f61e22c77b1a7cb148f6567996d816f72ac854f:/src/common/filename.cpp?ds=sidebyside diff --git a/src/common/filename.cpp b/src/common/filename.cpp index b6dd43a825..ffffe53275 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -12,24 +12,29 @@ /* Here are brief descriptions of the filename formats supported by this class: - wxPATH_UNIX: standard Unix format, absolute file names have the form + wxPATH_UNIX: standard Unix format, used under Darwin as well, absolute file + names have the form: /dir1/dir2/.../dirN/filename, "." and ".." stand for the current and parent directory respectively, "~" is parsed as the user HOME and "~username" as the HOME of that user - wxPATH_DOS: DOS/Windows format, absolute file names have the form + wxPATH_DOS: DOS/Windows format, absolute file names have the form: drive:\dir1\dir2\...\dirN\filename.ext where drive is a single letter. "." and ".." as for Unix but no "~". There are also UNC names of the form \\share\fullpath - wxPATH_MAC: Mac OS 8/9 format, absolute file names have the form + wxPATH_MAC: Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file + names have the form volume:dir1:...:dirN:filename and the relative file names are either :dir1:...:dirN:filename or just filename (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. wxPATH_VMS: VMS native format, absolute file names have the form :[dir1.dir2.dir3]file.txt @@ -56,49 +61,67 @@ // ---------------------------------------------------------------------------- #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 +#endif + +#ifdef __VISAGECPP__ +#ifndef MAX_PATH +#define MAX_PATH 256 +#endif #endif // ---------------------------------------------------------------------------- @@ -208,6 +231,7 @@ void wxFileName::Assign( const wxFileName &filepath ) m_dirs = filepath.GetDirs(); m_name = filepath.GetName(); m_ext = filepath.GetExt(); + m_relative = filepath.IsRelative(); } void wxFileName::Assign(const wxString& volume, @@ -216,23 +240,84 @@ void wxFileName::Assign(const wxString& volume, const wxString& ext, wxPathFormat format ) { - wxStringTokenizer tn(path, GetPathSeparators(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(); - while ( tn.HasMoreTokens() ) + + if (!my_path.empty()) { - wxString token = tn.GetNextToken(); + // 1) Determine if the path is relative or absolute. - // if the path starts with a slash, we do need the first empty dir - // entry to be able to tell later that it was an absolute path, but - // otherwise ignore the double slashes - if ( m_dirs.IsEmpty() || !token.IsEmpty() ) - m_dirs.Add( token ); - } + switch (my_format) + { + case wxPATH_MAC: + m_relative = ( my_path[0u] == 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 + // (relative) (dir) (file.txt) + // "::dir:file.txt" actually means "../dir/file.txt" + // stored as (relative) (..) (dir) (file.txt) + // This is important only for the Mac as an empty dir + // actually means , whereas under DOS, double + // slashes can be ignored: "\\\\" is the same as "\\". + if (m_relative) + my_path.Remove( 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('/') ); + break; + case wxPATH_DOS: + m_relative = ( (my_path[0u] != wxT('/')) && (my_path[0u] != wxT('\\')) ); + break; + default: + wxFAIL_MSG( wxT("error") ); + break; + } - m_volume = volume; - m_ext = ext; - m_name = name; + // 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() ) + { + wxString token = tn.GetNextToken(); + + // Remove empty token under DOS and Unix, interpret them + // as .. under Mac. + if (token.empty()) + { + if (my_format == wxPATH_MAC) + m_dirs.Add( wxT("..") ); + // else ignore + } + else + { + m_dirs.Add( token ); + } + } + } + else + { + m_relative = TRUE; + } } void wxFileName::Assign(const wxString& fullpath, @@ -244,13 +329,39 @@ void wxFileName::Assign(const wxString& fullpath, Assign(volume, path, name, ext, format); } -void wxFileName::Assign(const wxString& fullpath, +void wxFileName::Assign(const wxString& fullpathOrig, const wxString& fullname, wxPathFormat format) { + // always recognize fullpath as directory, even if it doesn't end with a + // slash + wxString fullpath = fullpathOrig; + if ( !wxEndsWithPathSeparator(fullpath) ) + { + fullpath += GetPathSeparators(format)[0u]; + } + wxString volume, path, name, ext; + + // do some consistency checks in debug mode: the name should be really just + // the filename and the path should be really just a path +#ifdef __WXDEBUG__ + wxString pathDummy, nameDummy, extDummy; + + SplitPath(fullname, &pathDummy, &name, &ext, format); + + wxASSERT_MSG( pathDummy.empty(), + _T("the file name shouldn't contain the path") ); + + SplitPath(fullpath, &volume, &path, &nameDummy, &extDummy, format); + + wxASSERT_MSG( nameDummy.empty() && extDummy.empty(), + _T("the path shouldn't contain file name nor extension") ); + +#else // !__WXDEBUG__ SplitPath(fullname, NULL /* no path */, &name, &ext, format); SplitPath(fullpath, &volume, &path, NULL, NULL, format); +#endif // __WXDEBUG__/!__WXDEBUG__ Assign(volume, path, name, ext, format); } @@ -311,15 +422,33 @@ bool wxFileName::DirExists( const wxString &dir ) // CWD and HOME stuff // ---------------------------------------------------------------------------- -void wxFileName::AssignCwd() +void wxFileName::AssignCwd(const wxString& volume) { - AssignDir(wxFileName::GetCwd()); + AssignDir(wxFileName::GetCwd(volume)); } /* static */ -wxString wxFileName::GetCwd() +wxString wxFileName::GetCwd(const wxString& volume) { - return ::wxGetCwd(); + // if we have the volume, we must get the current directory on this drive + // and to do this we have to chdir to this volume - at least under Windows, + // I don't know how to get the current drive on another volume elsewhere + // (TODO) + wxString cwdOld; + if ( !volume.empty() ) + { + cwdOld = wxGetCwd(); + SetCwd(volume + GetVolumeSeparator()); + } + + wxString cwd = ::wxGetCwd(); + + if ( !volume.empty() ) + { + SetCwd(cwdOld); + } + + return cwd; } bool wxFileName::SetCwd() @@ -342,19 +471,206 @@ wxString wxFileName::GetHomeDir() return ::wxGetHomeDir(); } -void wxFileName::AssignTempFileName( const wxString &prefix ) +void wxFileName::AssignTempFileName(const wxString& prefix, wxFile *fileTemp) { - wxString fullname; - if ( wxGetTempFileName(prefix, fullname) ) + wxString tempname = CreateTempFileName(prefix, fileTemp); + if ( tempname.empty() ) { - Assign(fullname); + // error, failed to get temp file name + Clear(); } - else // error + else // ok { - Clear(); + Assign(tempname); } } +/* static */ +wxString +wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) +{ + wxString path, dir, name; + + // use the directory specified by the prefix + SplitPath(prefix, &dir, &name, NULL /* extension */); + +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) + +#ifdef __WIN32__ + if ( dir.empty() ) + { + if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) ) + { + wxLogLastError(_T("GetTempPath")); + } + + if ( dir.empty() ) + { + // GetTempFileName() fails if we pass it an empty string + dir = _T('.'); + } + } + + if ( !::GetTempFileName(dir, name, 0, wxStringBuffer(path, MAX_PATH + 1)) ) + { + wxLogLastError(_T("GetTempFileName")); + + path.clear(); + } +#else // Win16 + if ( !::GetTempFileName(NULL, prefix, 0, wxStringBuffer(path, 1025)) ) + { + path.clear(); + } +#endif // Win32/16 + +#elif defined(__WXPM__) + // for now just create a file + // + // future enhancements can be to set some extended attributes for file + // systems OS/2 supports that have them (HPFS, FAT32) and security + // (HPFS386) + static const wxChar *szMktempSuffix = wxT("XXX"); + path << dir << _T('/') << name << szMktempSuffix; + + // Temporarily remove - MN + #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 ( dir.empty() ) + { + dir = wxGetenv(_T("TEMP")); + } + + if ( dir.empty() ) + { + // default + #ifdef __DOS__ + dir = _T("."); + #else + dir = _T("/tmp"); + #endif + } +#endif // Mac/!Mac + } + + path = dir; + + if ( !wxEndsWithPathSeparator(dir) && + (name.empty() || !wxIsPathSeparator(name[0u])) ) + { + path += wxFILE_SEP_PATH; + } + + path += name; + +#if defined(HAVE_MKSTEMP) + // 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()); + 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 // mkstemp() succeeded + { + // avoid leaking the fd + if ( fileTemp ) + { + fileTemp->Attach(fdTemp); + } + else + { + close(fdTemp); + } + } +#else // !HAVE_MKSTEMP + +#ifdef HAVE_MKTEMP + // same as above + path += _T("XXXXXX"); + + if ( !mktemp((char *)path.mb_str()) ) + { + path.clear(); + } +#else // !HAVE_MKTEMP (includes __DOS__) + // generate the unique file name ourselves + #ifndef __DOS__ + path << (unsigned int)getpid(); + #endif + + wxString pathTry; + + static const size_t numTries = 1000; + for ( size_t n = 0; n < numTries; n++ ) + { + // 3 hex digits is enough for numTries == 1000 < 4096 + pathTry = path + wxString::Format(_T("%.03x"), n); + if ( !wxFile::Exists(pathTry) ) + { + break; + } + + pathTry.clear(); + } + + path = pathTry; +#endif // HAVE_MKTEMP/!HAVE_MKTEMP + + if ( !path.empty() ) + { + } +#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()... + // + // 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) + // fails, though of course it should be protected against + // possible infinite looping too. + + wxLogError(_("Failed to open temporary file.")); + + path.clear(); + } + } + + return path; +} + // ---------------------------------------------------------------------------- // directory operations // ---------------------------------------------------------------------------- @@ -429,13 +745,18 @@ bool wxFileName::Normalize(wxPathNormalize flags, format = GetFormat(format); // make the path absolute - if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() ) + if ( (flags & wxPATH_NORM_ABSOLUTE) && m_relative ) { if ( cwd.empty() ) - curDir.AssignCwd(); - else + { + curDir.AssignCwd(GetVolume()); + } + else // cwd provided + { 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 @@ -449,6 +770,8 @@ bool wxFileName::Normalize(wxPathNormalize flags, curDir.Clear(); } } +#endif + m_relative = FALSE; } // handle ~ stuff under Unix only @@ -486,7 +809,7 @@ bool wxFileName::Normalize(wxPathNormalize flags, { wxString dir = dirs[n]; - if ( flags && wxPATH_NORM_DOTS ) + if ( flags & wxPATH_NORM_DOTS ) { if ( dir == wxT(".") ) { @@ -503,7 +826,7 @@ bool wxFileName::Normalize(wxPathNormalize flags, return FALSE; } - m_dirs.Remove(m_dirs.GetCount() - 1); + m_dirs.RemoveAt(m_dirs.GetCount() - 1); continue; } } @@ -539,11 +862,53 @@ bool wxFileName::Normalize(wxPathNormalize flags, 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); + + bool withCase = IsCaseSensitive(format); + + // we can't do anything if the files live on different volumes + if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) ) + { + // nothing done + return FALSE; + } + + // same drive, so we don't need our volume + m_volume.clear(); + + // remove common directories starting at the top + while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() && + m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) ) + { + m_dirs.RemoveAt(0); + fnBase.m_dirs.RemoveAt(0); + } + + // add as many ".." as needed + size_t count = fnBase.m_dirs.GetCount(); + for ( size_t i = 0; i < count; i++ ) + { + m_dirs.Insert(wxT(".."), 0u); + } + + m_relative = TRUE; + + // we were modified + return TRUE; +} + // ---------------------------------------------------------------------------- // filename kind tests // ---------------------------------------------------------------------------- -bool wxFileName::SameAs( const wxFileName &filepath, wxPathFormat format) +bool wxFileName::SameAs(const wxFileName &filepath, wxPathFormat format) { wxFileName fn1 = *this, fn2 = filepath; @@ -569,67 +934,17 @@ bool wxFileName::IsCaseSensitive( wxPathFormat format ) return GetFormat(format) == wxPATH_UNIX; } -bool wxFileName::IsAbsolute( wxPathFormat format ) -{ - // if we have no path, we can't be an abs filename - if ( m_dirs.IsEmpty() ) - { - return FALSE; - } - - format = GetFormat(format); - - if ( format == wxPATH_UNIX ) - { - const wxString& str = m_dirs[0u]; - if ( str.empty() ) - { - // the path started with '/', it's an absolute one - return TRUE; - } - - // the path is absolute if it starts with a path separator or - // with "~" or "~user" - wxChar ch = str[0u]; - - return IsPathSeparator(ch, format) || ch == _T('~'); - } - else // !Unix - { - // must have the drive - if ( m_volume.empty() ) - return FALSE; - - switch ( format ) - { - default: - wxFAIL_MSG( _T("unknown wxPATH_XXX style") ); - // fall through - - case wxPATH_DOS: - return m_dirs[0u].empty(); - - case wxPATH_VMS: - // TODO: what is the relative path format here? - return TRUE; - - case wxPATH_MAC: - return !m_dirs[0u].empty(); - } - } -} - /* static */ wxString wxFileName::GetVolumeSeparator(wxPathFormat format) { wxString sepVol; - if ( GetFormat(format) != wxPATH_UNIX ) + if ( (GetFormat(format) == wxPATH_DOS) || + (GetFormat(format) == wxPATH_VMS) ) { - // so far it is the same for all systems which have it sepVol = wxFILE_SEP_DSK; } - //else: leave empty, no volume separators under Unix + //else: leave empty return sepVol; } @@ -732,16 +1047,82 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const { format = GetFormat( format ); - wxString ret; - size_t count = m_dirs.GetCount(); - for ( size_t i = 0; i < count; i++ ) + wxString fullpath; + + // 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 ) { - ret += m_dirs[i]; - if ( add_separator || (i < count) ) - ret += wxFILE_SEP_PATH; + if (!m_relative) + fullpath += wxFILE_SEP_PATH_UNIX; } - return ret; + // then concatenate all the path components using the path separator + size_t dirCount = m_dirs.GetCount(); + if ( dirCount ) + { + if ( format == wxPATH_VMS ) + { + 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 + 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: + { + wxFAIL_MSG( wxT("error") ); + } + } + } + } + + + + return fullpath; } wxString wxFileName::GetFullPath( wxPathFormat format ) const @@ -753,57 +1134,91 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const // 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 // !UNC - { - fullpath << m_volume << GetVolumeSeparator(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 && 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 } } + // 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; + } + // then concatenate all the path components using the path separator size_t dirCount = m_dirs.GetCount(); if ( dirCount ) { - // under Mac, we must have a path separator in the beginning of the - // relative path - otherwise it would be parsed as an absolute one - if ( format == wxPATH_MAC && m_volume.empty() && !m_dirs[0].empty() ) - { - fullpath += wxFILE_SEP_PATH_MAC; - } - - wxChar chPathSep = GetPathSeparators(format)[0u]; if ( format == wxPATH_VMS ) { - fullpath += _T('['); + fullpath += wxT('['); } + for ( size_t i = 0; i < dirCount; i++ ) { - // under VMS, we shouldn't have a leading dot - if ( i && (format != wxPATH_VMS || !m_dirs[i - 1].empty()) ) - fullpath += chPathSep; - - fullpath += m_dirs[i]; - } + // TODO: What to do with ".." under VMS - if ( format == wxPATH_VMS ) - { - fullpath += _T(']'); - } - else // !VMS - { - // separate the file name from the last directory, notice that we - // intentionally do it even if the name and extension are empty as - // this allows us to distinguish the directories from the file - // names (the directories have the trailing slash) - fullpath += chPathSep; + switch (format) + { + 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: + { + wxFAIL_MSG( wxT("error") ); + } + } } } @@ -850,7 +1265,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; @@ -858,19 +1273,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); @@ -898,7 +1311,7 @@ wxString wxFileName::GetLongPath() const } if (success) return pathOut; -#endif // wxUSE_DYNLIB_CLASS +#endif // wxUSE_DYNAMIC_LOADER if (!success) { @@ -959,7 +1372,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format ) { if (format == wxPATH_NATIVE) { -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__) format = wxPATH_DOS; #elif defined(__WXMAC__) && !defined(__DARWIN__) format = wxPATH_MAC; @@ -976,6 +1389,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format ) // path splitting function // ---------------------------------------------------------------------------- +/* static */ void wxFileName::SplitPath(const wxString& fullpathWithVolume, wxString *pstrVolume, wxString *pstrPath, @@ -989,7 +1403,7 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, // under VMS the end of the path is ']', not the path separator used to // separate the components - wxString sepPath = format == wxPATH_VMS ? _T(']') + wxString sepPath = format == wxPATH_VMS ? wxString(_T(']')) : GetPathSeparators(format); // special Windows UNC paths hack: transform \\share\path into share:path @@ -1012,10 +1426,11 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, } } - // do we have the volume name in the beginning? - wxString sepVol = GetVolumeSeparator(format); - if ( !sepVol.empty() ) + // We separate the volume here + if ( format == wxPATH_DOS || format == wxPATH_VMS ) { + wxString sepVol = GetVolumeSeparator(format); + size_t posFirstColon = fullpath.find_first_of(sepVol); if ( posFirstColon != wxString::npos ) { @@ -1066,7 +1481,7 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, else { // take everything up to the path separator but take care to make - // tha path equal to something like '/', not empty, for the files + // the path equal to something like '/', not empty, for the files // immediately under root directory size_t len = posLastSlash; if ( !len ) @@ -1121,6 +1536,22 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, } } +/* static */ +void wxFileName::SplitPath(const wxString& fullpath, + wxString *path, + wxString *name, + wxString *ext, + wxPathFormat format) +{ + wxString volume; + SplitPath(fullpath, &volume, path, name, ext, format); + + if ( path && !volume.empty() ) + { + path->Prepend(volume + GetVolumeSeparator(format)); + } +} + // ---------------------------------------------------------------------------- // time functions // ---------------------------------------------------------------------------- @@ -1129,7 +1560,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtCreate, const wxDateTime *dtAccess, const wxDateTime *dtMod) { -#if defined(__UNIX_LIKE__) +#if defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__)) if ( !dtAccess && !dtMod ) { // can't modify the creation time anyhow, don't try @@ -1198,20 +1629,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, wxDateTime *dtMod, wxDateTime *dtChange) const { -#if defined(__UNIX_LIKE__) - wxStructStat stBuf; - if ( wxStat(GetFullPath(), &stBuf) == 0 ) - { - if ( dtAccess ) - dtAccess->Set(stBuf.st_atime); - if ( dtMod ) - dtMod->Set(stBuf.st_mtime); - if ( dtChange ) - dtChange->Set(stBuf.st_ctime); - - return TRUE; - } -#elif defined(__WXMAC__) +#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) wxStructStat stBuf; if ( wxStat(GetFullPath(), &stBuf) == 0 ) { @@ -1254,3 +1672,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 ) ) + { + MacSetTypeAndCreator( type , creator ) ; + } +} + +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 +