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

fix for splitting the UNC paths

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-04-07 22:42:35 +00:00
parent a160a3252f
commit 67c34f64d4
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/common/filename.cpp
View File

@ -239,6 +239,31 @@ static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt)
#endif // __WIN32__ #endif // __WIN32__
// return a string with the volume par
static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format)
{
wxString path;
if ( !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 && 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 // implementation
// ============================================================================ // ============================================================================
@ -1192,27 +1217,8 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
{ {
format = GetFormat(format); format = GetFormat(format);
wxString fullpath;
// first put the volume // first put the volume
if ( !m_volume.empty() ) wxString fullpath = wxGetVolumeString(m_volume, 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 // the leading character
if ( format == wxPATH_MAC ) if ( format == wxPATH_MAC )
@ -1620,9 +1626,9 @@ void wxFileName::SplitPath(const wxString& fullpath,
wxString volume; wxString volume;
SplitPath(fullpath, &volume, path, name, ext, format); SplitPath(fullpath, &volume, path, name, ext, format);
if ( path && !volume.empty() ) if ( path )
{ {
path->Prepend(volume + GetVolumeSeparator(format)); path->Prepend(wxGetVolumeString(volume, format));
} }
} }