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

no, we shouldn't inconditionally add the separator at the end even if wxPATH_GET_SEPARATOR was specified -- this is wrong for file names without path at all

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-22 22:47:15 +00:00
parent 149147e1b7
commit 2361ce822f
1 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/common/filename.cpp
View File

@@ -1144,27 +1144,40 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
} }
// the leading character // the leading character
if ( format == wxPATH_MAC ) switch ( format )
{ {
if ( m_relative ) case wxPATH_MAC:
fullpath += wxFILE_SEP_PATH_MAC; if ( m_relative )
} fullpath += wxFILE_SEP_PATH_MAC;
else if ( format == wxPATH_DOS ) break;
{
if (!m_relative) case wxPATH_DOS:
fullpath += wxFILE_SEP_PATH_DOS; if (!m_relative)
} fullpath += wxFILE_SEP_PATH_DOS;
else if ( format == wxPATH_UNIX ) break;
{
if ( !m_relative ) default:
{ wxFAIL_MSG( _T("unknown path format") );
// normally the absolute file names starts with a slash with one // fall through
// exception: file names like "~/foo.bar" don't have it
if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') ) case wxPATH_UNIX:
if ( !m_relative )
{ {
fullpath += wxFILE_SEP_PATH_UNIX; // 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;
}
} }
} break;
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 // then concatenate all the path components using the path separator
@@ -1204,13 +1217,14 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
case wxPATH_VMS: case wxPATH_VMS:
// TODO: What to do with ".." under VMS // TODO: What to do with ".." under VMS
// convert back from ".." to nothing // convert back from ".." to nothing
if ( m_dirs[i] != wxT("..") ) if ( m_dirs[i] != wxT("..") )
fullpath += m_dirs[i]; fullpath += m_dirs[i];
break; break;
} }
if ( i != dirCount - 1 ) if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) )
fullpath += GetPathSeparator(format); fullpath += GetPathSeparator(format);
} }
@@ -1220,11 +1234,6 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
} }
} }
if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() && fullpath.Last() != GetPathSeparator(format))
{
fullpath += GetPathSeparator(format);
}
return fullpath; return fullpath;
} }
@@ -1283,6 +1292,9 @@ wxString wxFileName::GetLongPath() const
if ( !s_triedToLoad ) if ( !s_triedToLoad )
{ {
// suppress the errors about missing GetLongPathName[AW]
wxLogNull noLog;
s_triedToLoad = TRUE; s_triedToLoad = TRUE;
wxDynamicLibrary dllKernel(_T("kernel32")); wxDynamicLibrary dllKernel(_T("kernel32"));
if ( dllKernel.IsLoaded() ) if ( dllKernel.IsLoaded() )
@@ -1320,6 +1332,7 @@ wxString wxFileName::GetLongPath() const
} }
} }
} }
if (success) if (success)
return pathOut; return pathOut;
#endif // wxUSE_DYNAMIC_LOADER #endif // wxUSE_DYNAMIC_LOADER