WebSVN – spk – Diff – //libspk/src/File_IO.cpp

 	File.close();
 	this->close();
 	File.setAutoDelete(false);
 	// now copy to original file
-	std::remove(m_sFilename.c_str());
+	if ( std::remove(m_sFilename.c_str()) == 0 ) {
-	std::rename("temp.tmp", m_sFilename.c_str());
+		std::rename("temp.tmp", m_sFilename.c_str());
+		return FILEERR_NONE;
+	}
-	return FILEERR_NONE;
+	return FILEERR_NOWRITE;
+}
 int CFileIO::_in() const
+{
 	if ( m_bBinary ) return std::ios::in | std::ios::binary;
+}
 int CFileIO::_inout() const
+{
 	if ( m_bBinary ) return std::ios::in | std::ios::out | std::ios::binary;
 	return std::ios::in | std::ios::out;
 }
 int CFileIO::_append() const
+{
 	if ( m_bBinary ) return std::ios::out | std::ios::binary | std::ios::app;
 	return std::ios::out | std::ios::app;
+}
 	if ( !file.is_open() ) return NULL;
 	char *data;
 	try {
 		data = new char[m_lSize + 1];
 	}
 	catch (std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "CFileIO::ReadToData() unable to malloc storage, %d (%s)", m_lSize + 1, e.what());
 		file.close();
 		return NULL;
 	}
 	try {
 		file.read((char *)data, m_lSize);
 	}
 	catch (std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "CFileIO::ReadToData() unable to read data from file (%s)", e.what());
 		file.close();
 		return NULL;
+	}
 	*size = m_lSize;
 	file.close();
 	return data;
 }
 bool CFileIO::WriteData ( const char *data, size_t size )
+{
 	if ( NoFile() )
 		return false;
+	}
 	File.close();
 	if ( ret ) this->_readFileSize();
 	return ret;
 }
 bool CFileIO::WriteString ( CyString data )
+{
 	return WriteData ( data.c_str(), data.Length() );
+}
+}
 void CFileIO::close()
+{
 	if ( this->isOpened() ) m_fId.close();
 }
 int CFileIO::readSize()
 {
 	unsigned char size[4];
 	if ( this->read(size, 4) ) return (size[0] << 24) + (size[1] << 16) + (size[2] << 8) + size[3];
 	return 0;
+}
 bool CFileIO::AtEnd() const
 {
 	return this->atEnd();
+}
 bool CFileIO::atEnd() const
+{
 	if ( !this->isOpened() ) return true;
 	std::fstream toFile(m_sFilename, _append());
 	if ( !toFile.is_open() ) {
 		fromFile.close();
 		return false;
 	}
 	// move to the end of the file
 	toFile.seekg(0, std::ios::end);
 	// get size of file
 	fromFile.seekg(0, std::ios::end);
 	size_t size = fromFile.tellg();
 		size -= read;
 		fromFile.read(data, read);
 		toFile.write(data, read);
 	}
 	fromFile.close();
 	toFile.close();
 	return true;
+}
 bool CFileIO::AppendData ( const char *d, size_t size )
+{
-	std::fstream File(m_sFilename, _append());
+	std::ofstream File(m_sFilename, _append());
 	if ( !File.is_open() ) return false;
 	// move to the end of the file
-	File.seekg(0, std::ios::end);
+	//File.seekg(0, std::ios::end);
 	char *pos = (char *)d;
 	while ( size > 0 ) {
 		size_t read = 500000;
 		if ( read > size ) read = size;
+		}
 		pos += read;
+	}
 	File.close();
 	return true;
 }
 bool CFileIO::AppendDataToPos ( const char *d, size_t size, size_t start )
+{
 	if ( start > m_lSize ) return false;
 	if ( m_lSize <= 0 ) {
 		if ( !this->startWrite() ) return false;
 Utils::String CFileIO::readEndOfLine()
+{
 	if ( !this->isOpened() ) {
 		if ( !StartRead() )	return "";
 	}
 	Utils::String str;
 	std::getline(m_fId, str, '\n');
 	return str;
+}
 Utils::String CFileIO::baseName() const
+{
 	return m_sFile.token(".", -2);
 }
 CyString CFileIO::GetFileExtension ()
 {
 	if ( m_sFilename.empty() ) return NullString;
+	return m_sFilename.token(".", -1);
+}
+Utils::String CFileIO::extension ()
+{
+	if ( m_sFilename.empty() ) return "";
 	return m_sFilename.token(".", -1);
+}
 CyString CFileIO::ChangeFileExtension ( CyString ext )
+{
 	//if ( !Exists() ) return false;
 	return (std::remove(rem) == 0) ? true : false;
+}
 bool CFileIO::remove()
 {
 	if ( this->isOpened() ) this->close();
 	if ( !this->exists() ) return false;
 	if ( std::remove(m_sFilename.c_str()) == 0 ) return true;
 	return false;
+}
 bool CFileIO::WriteFileUTF(std::vector<CyString> *lines)
+{
 	if ( !lines || m_sFilename.empty() )
 		return false;
 	// we need to create the directory
 	if ( !m_sDirIO.Exists() )
+	{
 		if ( !m_sDirIO.Create() )
 	// write the rest
 	for ( int i = 0; i < (int)lines->size(); i++ )
+	{
 		CyString l = lines->at(i);
 		if ( l.IsIn('\n') )
 		{
 			int max;
 			CyString *strs = l.SplitToken("\n", &max);
 			if ( strs && max )
+			{
 				for ( int i = 0; i < max; i++ )
 	if ( !stat(GetWindowsFilename().c_str(), &fileStat) )
 		return (time_t)fileStat.st_atime;
 #endif
 	return 0;
+}
+size_t CFileIO::position()
+{
+	return m_fId.tellg();
+}
 /**
  * Copys the contents of a file to another
+ *
  * Reads and writes the files in block
  */

Subversion Repositories spk

(root)//libspk/src/File_IO.cpp – Rev 57 → 58