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

always make the name of the file to replace absolute before using it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-04 13:06:28 +00:00
parent 3752e0abf1
commit 44b62d54c6
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/file.cpp
View File

@@ -469,6 +469,7 @@ bool wxFile::Eof() const
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
wxTempFile::wxTempFile(const wxString& strName)
{
Open(strName);
@@ -476,9 +477,22 @@ wxTempFile::wxTempFile(const wxString& strName)
bool wxTempFile::Open(const wxString& strName)
{
m_strName = strName;
// we must have an absolute filename because otherwise CreateTempFileName()
// would create the temp file in $TMP (i.e. the system standard location
// for the temp files) which might be on another volume/drive/mount and
// wxRename()ing it later to m_strName from Commit() would then fail
//
// with the absolute filename, the temp file is created in the same
// directory as this one which ensures that wxRename() may work later
wxFileName fn(strName);
if ( !fn.IsAbsolute() )
{
fn.Normalize(wxPATH_NORM_ABSOLUTE);
}
m_strTemp = wxFileName::CreateTempFileName(strName, &m_file);
m_strName = fn.GetFullPath();
m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);
if ( m_strTemp.empty() )
{
@@ -491,7 +505,7 @@ bool wxTempFile::Open(const wxString& strName)
mode_t mode;
wxStructStat st;
if ( stat(strName.fn_str(), &st) == 0 )
if ( stat(m_strName.fn_str(), &st) == 0 )
{
mode = st.st_mode;
}