X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ce27aa2fdfc14e6cbe811661a95f98e9563b1e5..2245b2b2c3339ecf023e5880caa803610a5d1907:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index e99778308b..5d19924436 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -146,7 +146,7 @@ public: m_hFile = ::CreateFile ( filename, // name - mode == Read ? GENERIC_READ // access mask + mode == Read ? GENERIC_READ // access mask : GENERIC_WRITE, 0, // no sharing NULL, // no secutity attr @@ -415,7 +415,7 @@ void wxFileName::Assign(const wxString& fullpathOrig, _T("the path shouldn't contain file name nor extension") ); #else // !__WXDEBUG__ - SplitPath(fullname, NULL /* no path */, &name, &ext, format); + SplitPath(fullname, NULL /* no path */, &name, &ext, format); SplitPath(fullpath, &volume, &path, NULL, NULL, format); #endif // __WXDEBUG__/!__WXDEBUG__ @@ -751,10 +751,10 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) filename.AssignDir(dir); wxString currPath; - if ( filename.HasVolume()) - { + if ( filename.HasVolume()) + { currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE); - } + } wxArrayString dirs = filename.GetDirs(); size_t count = dirs.GetCount(); @@ -991,7 +991,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) if ( m_dirs.IsEmpty() && IsDir() ) { m_dirs.Add(_T('.')); - } + } } m_relative = TRUE; @@ -1156,8 +1156,15 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const } 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 @@ -1171,50 +1178,49 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const 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 ( i != dirCount - 1 ) + fullpath += GetPathSeparator(format); + } + + if ( format == wxPATH_VMS ) + { + fullpath += wxT(']'); } } - if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() ) + if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() && fullpath.Last() != GetPathSeparator(format)) { fullpath += GetPathSeparator(format); } @@ -1224,91 +1230,11 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const wxString wxFileName::GetFullPath( wxPathFormat format ) const { - format = GetFormat(format); - - // first put the volume - wxString fullpath = wxGetVolumeString(m_volume, format); - - // the leading character - if ( format == wxPATH_MAC ) - { - if ( m_relative ) - fullpath += wxFILE_SEP_PATH_MAC; - } - else if ( format == wxPATH_DOS ) - { - if ( !m_relative ) - fullpath += wxFILE_SEP_PATH_DOS; - } - else if ( format == wxPATH_UNIX ) - { - if ( !m_relative ) - { - // normally the absolute file names starts with a slash with one - // exception: file names like "~/foo.bar" don't have it - if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') ) - { - fullpath += wxFILE_SEP_PATH_UNIX; - } - } - } - - // 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") ); - } - } - } - } + // we already have a function to get the path + wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR, + format); - // finally add the file name and extension + // now just add the file name and extension to it fullpath += GetFullName(); return fullpath; @@ -1351,7 +1277,7 @@ wxString wxFileName::GetLongPath() const bool success = FALSE; #if wxUSE_DYNAMIC_LOADER - typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); + typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); static bool s_triedToLoad = FALSE; @@ -1737,16 +1663,16 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, FILETIME ftAccess, ftCreate, ftWrite; if ( ::GetFileTime(fh, - dtMod ? &ftCreate : NULL, + dtCreate ? &ftCreate : NULL, dtAccess ? &ftAccess : NULL, - dtCreate ? &ftWrite : NULL) ) + dtMod ? &ftWrite : NULL) ) { - if ( dtMod ) - ConvertFileTimeToWx(dtMod, ftCreate); + if ( dtCreate ) + ConvertFileTimeToWx(dtCreate, ftCreate); if ( dtAccess ) ConvertFileTimeToWx(dtAccess, ftAccess); - if ( dtCreate ) - ConvertFileTimeToWx(dtCreate, ftWrite); + if ( dtMod ) + ConvertFileTimeToWx(dtMod, ftWrite); return TRUE; } @@ -1786,18 +1712,18 @@ static void MacEnsureDefaultExtensionsLoaded() 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 ) +bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) { FInfo fndrInfo ; FSSpec spec ; @@ -1811,7 +1737,7 @@ bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) return true ; } -bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) +bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) { FInfo fndrInfo ; FSSpec spec ; @@ -1835,7 +1761,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() ;