Subversion Repositories spk

Rev

Rev 84 | Rev 86 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 84 Rev 85
Line 259... Line 259...
259
	File.setAutoDelete(false);
259
	File.setAutoDelete(false);
260
 
260
 
261
	// now copy to original file
261
	// now copy to original file
262
	if ( std::remove(m_sFilename.c_str()) == 0 ) {
262
	if ( std::remove(m_sFilename.c_str()) == 0 ) {
263
		std::rename(CPackages::tempDirectory() + "/temp.tmp", m_sFilename.c_str());
263
		std::rename(CPackages::tempDirectory() + "/temp.tmp", m_sFilename.c_str());
-
 
264
		size_t oldSize = m_lSize;
264
		size_t checkFileSize = m_lSize - datasize;
265
		size_t checkFileSize = m_lSize - datasize;
265
		this->_readFileSize();
266
		this->_readFileSize();
266
		if ( checkFileSize != m_lSize ) {
267
		if ( checkFileSize != m_lSize ) {
267
			CLog::log(CLog::Log_IO, 3, Utils::String("WARNING: CFileIO::TruncateFile, file size mismatch, ") + (long)checkFileSize + " => " + (long)m_lSize);
268
			CLog::log(CLog::Log_IO, 3, Utils::String("WARNING: CFileIO::TruncateFile, file size mismatch, ") + (long)checkFileSize + " => " + (long)m_lSize);
268
		}
269
		}
Line 507... Line 508...
507
		if ( iDoSize > iSizeLeft ) iDoSize = iSizeLeft;
508
		if ( iDoSize > iSizeLeft ) iDoSize = iSizeLeft;
508
 
509
 
509
		if ( !file.read(data, iDoSize) ) bSuccess = false;
510
		if ( !file.read(data, iDoSize) ) bSuccess = false;
510
		if ( bSuccess && !this->write(data, iDoSize) ) bSuccess = false;
511
		if ( bSuccess && !this->write(data, iDoSize) ) bSuccess = false;
511
		if ( !bSuccess ) break;
512
		if ( !bSuccess ) break;
512
		m_lSize += iDoSize;		
-
 
513
		iSizeLeft -= iDoSize;
513
		iSizeLeft -= iDoSize;
514
	}
514
	}
515
 
515
 
516
	delete data;
516
	delete data;
517
 
517
 
Line 1009... Line 1009...
1009
	time_t time = GetCreationTime();
1009
	time_t time = GetCreationTime();
1010
 
1010
 
1011
	CFileIO File(toFile);
1011
	CFileIO File(toFile);
1012
	if ( File.write(*this, m_lSize) ) {
1012
	if ( File.write(*this, m_lSize) ) {
1013
		if ( keepTime )	File.SetCreationTime(time);
1013
		if ( keepTime )	File.SetCreationTime(time);
-
 
1014
		this->close();
1014
		return true;
1015
		return true;
1015
	}
1016
	}
1016
/*
1017
/*
1017
	std::fstream f(GetWindowsFilename().c_str(), std::fstream::in | std::fstream::binary);
1018
	std::fstream f(GetWindowsFilename().c_str(), std::fstream::in | std::fstream::binary);
1018
	f << std::noskipws;
1019
	f << std::noskipws;