Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't replace . and .. with the corresponding directoties names in GetLongPath() as this breaks the normalization of file names without wxPATH_NORM_DOTS flag (#9814)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-12 15:15:32 +00:00
parent 8a493b67ac
commit ea6319cb38
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/filename.cpp
View File

@@ -1896,19 +1896,21 @@ wxString wxFileName::GetLongPath() const
size_t count = dirs.GetCount();
for ( size_t i = 0; i < count; i++ )
{
const wxString& dir = dirs[i];
// We're using pathOut to collect the long-name path, but using a
// temporary for appending the last path component which may be
// short-name
tmpPath = pathOut + dirs[i];
tmpPath = pathOut + dir;
if ( tmpPath.empty() )
continue;
// can't see this being necessary? MF
if ( tmpPath.Last() == GetVolumeSeparator(wxPATH_DOS) )
// We must not process "." or ".." here as they would be (unexpectedly)
// replaced by the corresponding directory names so just leave them
// alone
//
// And we can't pass a drive and root dir to FindFirstFile (VZ: why?)
if ( tmpPath.empty() || dir == '.' || dir == ".." ||
tmpPath.Last() == GetVolumeSeparator(wxPATH_DOS) )
{
// Can't pass a drive and root dir to FindFirstFile,
// so continue to next dir
tmpPath += wxFILE_SEP_PATH;
pathOut = tmpPath;
continue;