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

 	char *data = new char[offset];
 	fread ( data, sizeof(unsigned char), offset, id );
 	fwrite ( data, sizeof(unsigned char), offset, writeId );
 	delete data;
-	/*
-	// first write the data before the file
-	size_t tosize = offset;
-	while ( tosize )
-	{
-		int read = 500000;
-		if ( read > tosize )
-			read = tosize;
-		fread ( data, sizeof(unsigned char), read, id );
-		fwrite ( data, sizeof(unsigned char), read, writeId );
-		tosize -= read;
-	}
-*/
 	// next fseek after and write
 	fseek ( id, datasize, SEEK_CUR );
 	size = fullsize - offset - datasize;
+	if ( size > 0 ) {
-	data = new char[size];
+		data = new char[size];
-	fread ( data, sizeof(unsigned char), size, id );
+		fread ( data, sizeof(unsigned char), size, id );
-	fwrite ( data, sizeof(unsigned char), size, writeId );
+		fwrite ( data, sizeof(unsigned char), size, writeId );
-	delete data;
+		delete data;
-	/*
-	while ( size )
-	{
+	}
-		int read = 500000;
-		if ( read > size )
-			read = size;
-		fread ( data, sizeof(unsigned char), read, id );
-		fwrite ( data, sizeof(unsigned char), read, writeId );
-		size -= read;
-	}*/
 	fclose ( writeId );
 	fclose ( id );
 	// now copy to original file
 		// read data
 		fseek ( id, readpos, SEEK_SET );
 		fread ( data, sizeof(unsigned char), read, id );
 		size -= read;
 		readpos += read;
 		// now seek back and write
 		fseek ( id, writepos, SEEK_SET );
 		fwrite ( data, sizeof(unsigned char), read, id );
 		writepos += read;
+	}
 	truncate ( m_sFilename.c_str(), fullsize - datasize );
 	fclose ( id );
 #endif
 	return FILEERR_NONE;
+}
 char *CFileIO::ReadToData ( size_t *size )
 {
 	*size = 0;
 	if ( NoFile() )
 		return NULL;
 	if ( !m_lSize )
 		ReadFileSize();
 	if ( !m_lSize )
 		return NULL;
 	FILE *id = fopen ( m_sFilename.c_str(), (m_bBinary) ? "rb" : "r" );
 	if ( !id )
 		return NULL;
 	char *data = new char[m_lSize];
 	fread ( data, sizeof(char), m_lSize, id );
 	if ( ferror (id) )
+	{
+{
 	if ( NoFile() )
 		return false;
 	FILE *id = fopen ( m_sFilename.c_str(), (m_bBinary) ? "wb" : "w" );
 	if ( !id )
 		return false;
 	fwrite ( data, size, sizeof(char), id );
 	fclose ( id );
 	ReadFileSize();
 	return true;
+}
 bool CFileIO::WriteString ( CyString data )
+{
 	return WriteData ( data.c_str(), data.Length() );
 	if ( !id )
 		return false;
 	fclose ( id );
 	return true;
 }
 bool CFileIO::StartReadOld()
+{
 	if ( !m_sFilename.Empty() )
+	{
+}
 bool CFileIO::StartRead()
+{
 	if ( !m_sFilename.Empty() )
 	{
 		if ( m_bOpened )
 			StopRead();
 		m_fId.open(m_sFilename.c_str(), std::ios_base::in);
 		if ( m_fId.is_open() )
+		{
 			m_bOpened = true;
 			return true;
+		}
 	}
 	return false;
+}
 std::vector<CyString> *CFileIO::ReadLines()
 {
 	if ( m_sFilename.Empty() )
 		return 0;
 	std::vector<CyString> *file = new std::vector<CyString>;
 	std::string line;
 	file->clear();
 	CyStringList *file = new CyStringList;
 	std::string line;
 	std::ifstream infile (m_sFilename.c_str(), std::ios_base::in);
 	while (getline(infile, line, '\n'))
 	{
 		CyString l = line;
 		l.RemoveChar((char)0);
 		file->PushBack(l);
+	}
+	}
 	else
+	{
 		if ( m_fId.eof() )
 			return true;
 	}
 	return false;
+}
 bool CFileIO::AppendFile ( CyString filename )
+{
 	FILE *id = fopen ( filename.c_str(), (m_bBinary) ? "rb" : "r" );
 	if ( !id )
 		return false;
 	FILE *aid = fopen ( m_sFilename.c_str(), (m_bBinary) ? "ab" : "a" );
 	if ( !aid )
+	{
 		return false;
 		fclose ( id );
+	}
 	// move to the end of the file
 	fseek ( aid, 0, SEEK_END );
 	// get size of file
 	fseek ( id, 0, SEEK_END );
 	size_t size = ftell ( id );
 	fseek ( id, 0, SEEK_SET );
 	char data[500000];
 	while ( size > 0 )
+	{
 		size_t read = 500000;
 		if ( read > size )
 		fwrite ( data, sizeof(char), read, aid );
+	}
 	fclose ( aid );
 	fclose ( id );
 	return true;
 }
 bool CFileIO::AppendData ( const char *d, size_t size )
 {
 	FILE *aid = fopen ( m_sFilename.c_str(), (m_bBinary) ? "ab" : "a" );
 	if ( !aid )
 		return false;
 	// move to the end of the file
 	fseek ( aid, 0, SEEK_END );
 	char *pos = (char *)d;
 	while ( size > 0 )
+	{
 		size_t read = 500000;
 		if ( read > size )
 			read = size;
 		size -= read;
 		fwrite ( pos, sizeof(char), read, aid );
 		pos += read;
 	}
 	fclose ( aid );
 	return true;
+}
 bool CFileIO::AppendDataToPos ( const char *d, size_t size, size_t start )
+	{
 		fclose ( aid);
 		return false;
+	}
+	if ( start == end ) {
+		fseek(aid, 0, SEEK_END);
+	}
+	else {
-	fseek ( aid, start, SEEK_SET );
+		fseek ( aid, start, SEEK_SET );
+	}
 	char *pos = (char *)d;
 	while ( size > 0 )
+	{
 		size_t read = 500000;

Subversion Repositories spk

(root)/libspk/src/File_IO.cpp – Rev 33 → 42