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

 #include <time.h>
 #include "File.h"
 #include "DirIO.h"
 #include "Logging/Log.h"
-CCatFile::CCatFile ()
+CCatFile::CCatFile () : m_bCatChanged(false)
+{
 	m_iDataType = CATFILE_NONE;
 	m_sData = NULL;
 	m_lSize = 0;
 	m_bCreate = false;
 CCatFile::~CCatFile ()
+{
 	m_fDatFile.close();
 	m_fCatFile.close();
+	if ( m_bCatChanged ) {
+		WriteCatFile ();
+		m_fCatFile.close();
+	}
 	for ( SInCatFile *c = m_lFiles.First(); c; c = m_lFiles.Next() )
+	{
 		if ( c->sData )
-			delete c->sData;
+			delete []c->sData;
 		delete c;
+	}
+	if ( m_sData ) delete []m_sData;
 	m_lFiles.clear();
+}
 bool CCatFile::IsAddonDir(CyString dir)
+{
 	// size must be multiples of 5
 	size_t size = lFileSize + ((lFileSize % 5) ? 5 - (lFileSize % 5) : 0);
 	// read cat to buffer
 	try {
+		if ( m_sData ) delete [] m_sData;
 		m_sData = new unsigned char[size + 1];
+	}
 	catch (std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, "Memory Exception error, unable to alloc enough memory to store file data, %d (%s)", size + 1, e.what());
 		return CATERR_MALLOC;
 	size_t offset = 0;
 	unsigned char *data = m_sData;
 	int spacePos = -1;
-	while ( m_sData[num] != '\0' )
+	while ( m_sData[num] != '\0' ) {
-	{
-		if ( m_sData[num] == '\n' )
+		if ( m_sData[num] == '\n' ) {
-		{
 			m_sData[num] = 0;
 			if ( spacePos != -1 )
+			{
 				CyString file;
 				int size = 0;
 	return true;
+}
 void CCatFile::RemoveData ()
+{
-	if ( m_sData ) delete m_sData;
+	delete m_sData;
 	m_sData = NULL;
 	m_iDataType = CATFILE_NONE;
 	m_lSize = 0;
+}
 bool CCatFile::ReadFileToData ( SInCatFile *c )
+{
 	if ( !c ) return false;
 	size_t size = 0;
-	if ( !c->sData ) c->sData = ReadData ( c, &size );
+	if ( !c->sData ) c->sData = readData ( c, &size );
 	if ( c->sData )	return true;
 	return false;
+}
-unsigned char *CCatFile::ReadData ( SInCatFile *c, size_t *size )
+unsigned char *CCatFile::readData ( SInCatFile *c, size_t *size )
+{
 	*size = c->lSize;
-	std::fstream File(m_fDatFile.GetFullFilename().c_str(), std::ios::in | std::ios::binary);
-	if ( File.is_open() ) {
+	if ( !c->sData ) {
-		File.seekg(c->lOffset, std::ios::beg);
+		if ( m_fDatFile.startRead() ) {
-		unsigned char *data;
+			m_fDatFile.seek(c->lOffset);
-		try {
-			data = new unsigned char[c->lSize + 1];
+			c->sData = m_fDatFile.read(c->lSize);
-		}
-		catch(std::exception &e) {
-			CLog::logf(CLog::Log_IO, 2, "CCatFile::ReadData() unable to malloc data storage: %s, %d (%s)", c->sFile.c_str(), c->lSize, e.what());
-			File.close();
+			m_fDatFile.close();
-			return NULL;
-		}
-		try {
-			File.read((char *)data, c->lSize);
+			if ( !c->sData ) (*size) = 0;
-		}
+			else {
-		catch(std::exception &e) {
+				c->sData[c->lSize] = '\0';
-			CLog::logf(CLog::Log_IO, 2, "CCatFile::ReadData() unable to read file data: %s, %d (%s)", c->sFile.c_str(), c->lSize, e.what());
+				DecryptDAT(c->sData, c->lSize);
-			File.close();
+				c->bDecrypted = true;
-			return NULL;
+			}
+		}
-		File.close();
-		*size = c->lSize;
-		data[c->lSize] = '\0';
-		DecryptDAT(data, c->lSize);
-		c->bDecrypted = true;
-		return data;
+	}
-	return NULL;
+	return c->sData;
+}
 void CCatFile::DecryptDAT(SInCatFile *pFile)
+{
 	if ( pFile->bDecrypted ) return;
+{
 	for(unsigned char *pos=buffer, *end=buffer + size; pos < end; pos++){
 		*pos^=0x33;
+	}
+}
-unsigned char *CCatFile::ReadData ( CyString filename, size_t *size )
+unsigned char *CCatFile::readData ( CyString filename, size_t *size )
+{
 	*size = 0;
-	if ( !m_fDatFile.NoFile() )
+	if ( !m_fDatFile.NoFile() ) {
-	{
 		SInCatFile *c = FindData ( filename );
-		if ( c )
-			return ReadData ( c, size );
+		if ( c ) return readData ( c, size );
+	}
 	return NULL;
+}
+		}
+	}
 	// now just write the new cat file
 	m_lFiles.remove ( f );
-	WriteCatFile ();
+	m_bCatChanged = true;
 	return true;
+}
 bool CCatFile::WriteCatFile ()
+{
-	if ( (m_bCreate) && (m_lFiles.empty()) )
+	if ( (m_bCreate) && (m_lFiles.empty()) ) return false;
-		return false;
-	CyString cat = m_fCatFile.GetFilename() + "\n";
+	Utils::String cat = m_fCatFile.filename() + "\n";
-	for ( SInCatFile *f = m_lFiles.First(); f; f = m_lFiles.Next() )
+	for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() ) {
-	{
-		if ( f->sFile.Empty() )
+		if ( !node->Data() ) continue;
-			continue;
+		if ( node->Data()->sFile.Empty() ) continue;
+		Utils::String str = node->Data()->sFile.ToString();
-		cat += f->sFile.findreplace("/", "\\") + " " + (long)f->lSize + "\n";
+		cat += str.findReplace("/", "\\").findReplace("\\\\", "\\") + " " + (long)node->Data()->lSize + "\n";
+	}
-	if ( !cat.Length() )
+	if ( !cat.length() ) return false;
-		return false;
-	size_t len = cat.Length();
+	// make sure the len is in multiples of 5, otherwise decryptData could cause heap problems
-//	if ( len % 5)
-//		len += (5 - (len % 5));
+	size_t len = cat.length() + ((cat.length() % 5) ? 5 - (cat.length() % 5) : 0);
+	bool ret = false;
+	try {
-	unsigned char *data = new unsigned char[len + 1];
+		unsigned char *data = new unsigned char[len + 1];
-	memcpy ( data, cat.c_str(), cat.Length() );
+		memcpy(data, cat.c_str(), cat.length() * sizeof(unsigned char));
-	for ( size_t i = len; i > cat.Length(); i-- )
+		for ( size_t i = len; i >= cat.length(); i-- ) data[i] = '\0';
-		data[i] = '\0';
-	DecryptData ( data, len );
+		this->DecryptData(data, len);
-	m_fCatFile.WriteData ( (const char *)data, len );
+		bool ret = m_fCatFile.write(data, cat.length());
+		delete []data;
+	}
+	catch(std::exception &e) {
+		CLog::logf(CLog::Log_IO, 2, "CCatFile::WriteCatFile() unable to malloc, %d (%s)", len + 1, e.what());
+		return false;
+	}
+	m_fCatFile.close();
+	m_bCatChanged = false;
-	return true;
+	return ret;
+}
 bool CCatFile::CheckExtensionPck ( CyString filename )
+{
 	CyString ext = filename.GetToken ( ".", filename.NumToken  ( "." ) ).lower();
 bool CCatFile::AppendFile(const Utils::String &filename, const Utils::String &sTo, bool pck, bool bXor, Utils::String *sChangeTo)
+{
 	CLog::logf(CLog::Log_IO, 1, "CCatFile::AppendFile() Adding file, %s, into cat file, %s::%s [PCK:%s XOR:%s]", filename.c_str(), this->m_fCatFile.GetFilename().ToString().c_str(), sTo.c_str(), (pck) ? "Yes" : "No", (bXor) ? "Yes" : "No");
 	if ( filename.isin ( "::" ) ) return WriteFromCat ( filename.token("::", 1), filename.token("::", 2));
-	if ( (!m_bCreate) && (!m_fCatFile.exists ()) ) {
+	if ( (!m_bCreate) && (!m_fDatFile.exists ()) ) {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() Cat File: %s, doesn't exist, quitting...", m_fCatFile.GetFullFilename().ToString().c_str());
 		return false;
+	}
 	CyString to = sTo;
 	if ( !m_sAddonDir.Empty() && CCatFile::IsAddonDir(to) ) {
+	}
 	CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() cleaning up memory");
 	delete [] data;
+	m_fDatFile.close();
 	if ( append ) {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() append complete, adding file into cat list");
-		m_fDatFile.close();
 		m_bCreate = false;
 		f->sFile = to;
 		m_lFiles.push_back ( f );
 		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() writing the new cat file");
-		this->WriteCatFile ();
+		m_bCatChanged = true;
+	}
 	else {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() appending failed, cleaning up file data");
 		delete f;
+	}
+	CLog::logf(CLog::Log_IO, 4, "CCatFile::AppendFile() function complete");
-	return true;
+	return append;
+}
 bool CCatFile::AddData ( CyString catfile, unsigned char *data, size_t size, CyString to, bool pck, bool create )
+{
 	int err = Open ( catfile, "", CATREAD_CATDECRYPT, create );
+	{
 		m_fDatFile.close();
 		m_bCreate = false;
 		f->sFile = to;
 		m_lFiles.push_back ( f );
-		WriteCatFile ();
+		m_bCatChanged = true;
+	}
 	else
 		delete f;
 	return true;
 	if ( !getfile )
 		return false;
 	// read the dat from the cat file
 	size_t size = 0;
-	unsigned char *data = fcat->ReadData ( getfile, &size );
+	unsigned char *data = fcat->readData ( getfile, &size );
 	if ( !data )
 		return false;
 	// now check if it exists in this file
 	RemoveFile ( file );
 	// now write to the new file
-	if ( !m_fDatFile.AppendData ( (const char *)data, size ) )
+	if ( !m_fDatFile.AppendData ( (const char *)data, size ) ) return false;
-		return false;
 	// finally add to the list
 	SInCatFile *f = new SInCatFile;
 	f->sData = 0;
 	if ( m_lFiles.empty() )
 	else
 		f->lOffset = m_lFiles.Back()->Data()->lOffset + m_lFiles.Back()->Data()->lSize;
 	f->sFile = file;
 	f->lSize = size;
 	m_lFiles.push_back ( f );
-	WriteCatFile ();
+	m_bCatChanged = true;
 	return true;
+}
 bool CCatFile::WriteFromCat ( CyString catfile, CyString file )
+{
 	f->bDelete = true;
 	return true;
+}
-void CCatFile::WriteFiles()
-{
-	int count = 0;
-	CListNode<SInCatFile> *node;
-	for ( node = m_lFiles.Front(); node; node = node->next() )
-	{
-		if ( node->Data()->bDelete )
-			++count;
-	}
-	if ( !count )
-		return;
-	size_t *offset = new size_t[count * 2];
-	count = 0;
-	node = m_lFiles.Front();
-	while ( node )
-	{
-		CListNode<SInCatFile> *nextNode = node->next();
-		SInCatFile *f = node->Data();
-		if ( f->bDelete )
-		{
-			offset[count++] = f->lOffset;
-			offset[count++] = f->lSize;
-			m_lFiles.remove(node);
-			delete f;
-		}
-		node = nextNode;
-	}
-	if ( m_fDatFile.WritePartFile(offset, count) )
-		WriteCatFile();
-}
 CyStringList *CCatFile::GetTShipsEntries()
+{
 	if ( this->ExtractFile("types/tships.pck", "tships.txt") )
+	{
 		CFileIO TShips("tships.txt");

Subversion Repositories spk

(root)/libspk/src/CatFile.cpp – Rev 52 → 53