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

 #include "DirIO.h"
+#include "Logging/Log.h"
 CCatFile::CCatFile ()
+{
 	m_iDataType = CATFILE_NONE;
 	m_sData = NULL;
+{
 	if ( error == CATERR_NONE ) return true;
 	if ( allowCreate && error == CATERR_CREATED ) return true;
 	return false;
+}
-int CCatFile::Open ( CyString catfile, CyString addon, int readtype, bool create )
+int CCatFile::Open ( CyString sCatfile, CyString addon, int readtype, bool create )
+{
+	Utils::String catfile = sCatfile.ToString();
 	m_bCreate = false;
-	CyString datfile;
+	Utils::String datfile;
-	if ( !catfile.Right(4).Compare(".cat") )
+	if ( !catfile.right(4).Compare(".cat") ) {
-	{
 		datfile = catfile + ".dat";
 		catfile += ".cat";
 	}
-	else
-		datfile = catfile.Left ( -4 ) + ".dat";
+	else datfile = catfile.left(-4) + ".dat";
-	if ( readtype == CATREAD_JUSTCONTENTS )
+	if ( readtype == CATREAD_JUSTCONTENTS ) create = false;
-		create = false;
 	// first check if the dat file exists and opens
 	bool created = false;
-	if ( readtype != CATREAD_JUSTCONTENTS )
+	if ( readtype != CATREAD_JUSTCONTENTS ) {
-	{
-		FILE *id = fopen ( datfile.c_str(), "rb+" );
+		std::ifstream file(datfile);
-		if ( !id )
+		if ( !file.good() ) {
-		{
-			if ( create )
-				created = true;
+			if ( create ) created = true;
-			else
-				return CATERR_NODATFILE;
+			else		  return CATERR_NODATFILE;
+		}
-		if ( !created && id )
+		if ( file.is_open() ) file.close();
-			fclose ( id );
+	}
 	// now open the cat file to read
+	std::fstream File;
-	FILE *cid = fopen ( catfile.c_str(), "rb" );
+	File.open(catfile.c_str(), std::ios::in | std::ios::binary);
-	if ( !cid )
-	{
-		if ( create )
+	if ( !File.is_open() ) {
-			created = true;
+		if ( create ) created = true;
-		else
-			return CATERR_NOCATFILE;
+		else		  return CATERR_NOCATFILE;
+	}
-	if ( created )
+	if ( created ) {
-	{
-		m_fCatFile.Open ( catfile );
+		m_fCatFile.Open(catfile);
-		m_fDatFile.Open ( datfile );
+		m_fDatFile.Open(datfile);
 		m_bCreate = true;
 		return CATERR_CREATED;
+	}
 	// find the file size
-	fseek ( cid, 0, SEEK_END );
+	File.seekg(0, std::ios::end);
-	size_t lFileSize = ftell ( cid );
+	size_t lFileSize = File.tellg();
-	fseek ( cid, 0, SEEK_SET );
+	File.seekg(0, std::ios::beg);
-	if ( !lFileSize )
+	if ( !lFileSize ) {
-	{
-		fclose ( cid );
+		File.close();
 		return CATERR_FILEEMPTY;
+	}
 	// size must be multiples of 5
 	size_t size = lFileSize + ((lFileSize % 5) ? 5 - (lFileSize % 5) : 0);
 	// read cat to buffer
+	try {
-	m_sData = new unsigned char[size + 1];
+		m_sData = new unsigned char[size + 1];
+	}
-	m_sData[lFileSize] = 0;
+	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;
+	}
 	m_lSize = size;
+	try {
-	fread ( m_sData, sizeof(unsigned char), m_lSize, cid );
+		File.read((char *)m_sData, m_lSize);
-	if ( ferror(cid)  )
+	} catch (std::exception &e) {
-	{
+		CLog::logf(CLog::Log_IO, 3, "CCatFile::Open() unable to read from cat file, %s", e.what());
 		RemoveData ();
-		fclose ( cid );
+		File.close();
 		return CATERR_READCAT;
 	}
+	m_sData[size] = 0;
 	m_iDataType = CATFILE_READ;
-	fclose ( cid );
+	File.close();
-	if ( readtype != CATREAD_CAT )
+	if ( readtype != CATREAD_CAT ) {
-	{
-		if ( !DecryptData () )
-			return CATERR_DECRYPT;
+		if ( !DecryptData () ) return CATERR_DECRYPT;
 		m_sData[lFileSize] = 0;
 		ReadFiles ();
+	}
 	m_sAddonDir = addon;
 	m_fCatFile.Open ( catfile );
-	if ( readtype != CATREAD_JUSTCONTENTS )
+	if ( readtype != CATREAD_JUSTCONTENTS ) {
-	{
 		m_fDatFile.Open ( datfile );
 		// check the file size matches
 		long compare = 0;
-		FILE *id = fopen ( datfile.c_str(), "rb" );
+		std::fstream file(datfile, std::ios::in | std::ios::binary);
-		if ( id )
+		if ( file.is_open() ) {
-		{
-			fseek ( id, 0, SEEK_END );
+			file.seekg(0, std::ios::end);
-			compare = ftell ( id );
+			compare = file.tellg();
-			fclose ( id );
+			file.close();
+		}
-		/*
 		SInCatFile *c = m_lFiles.Back ()->Data();
-		if ( (c->lSize + c->lOffset) != compare )
+		//if ( (c->lSize + c->lOffset) != compare ) return CATERR_MISMATCH;
-			return CATERR_MISMATCH;
-		*/
 	}
-	if ( readtype >= CATREAD_DAT )
+	if ( readtype >= CATREAD_DAT ) LoadDatFile ();
-		LoadDatFile ();
 	return CATERR_NONE;
 }
 bool CCatFile::RemoveFile ( CyString file )
+{
 	if ( !m_sAddonDir.Empty() ) {
 		SInCatFile *f = FindData ( m_sAddonDir + "\\" + file );
 		if ( f )
 			RemoveFile(f);
 	}
+	{
 		SInCatFile *f = FindData ( CyString("addon\\") + file );
 		if ( f )
 			RemoveFile(f);
+	}
 	return RemoveFile ( f );
+}
 void CCatFile::LoadDatFile ()
 {
 	if ( m_fDatFile.NoFile() )
 		return;
-	FILE *id = fopen ( m_fDatFile.GetFullFilename().c_str(), "rb" );
+	std::fstream File(m_fDatFile.GetFullFilename().ToString().c_str(), std::ios::in | std::ios::binary);
-	if ( id )
+	if ( File.is_open() ) {
-	{
 		for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() )
+		{
 			SInCatFile *c = node->Data();
-			if ( c->sData )
-				delete c->sData;
+			if ( c->sData )	delete c->sData;
-			c->sData = new unsigned char[c->lSize + 1];
-			size_t readAmount = fread ( c->sData, sizeof(unsigned char), c->lSize, id );
-			if ( readAmount != c->lSize )
-                break;
+			try {
+				c->sData = new unsigned char[c->lSize + 1];
+			}
+			catch (std::exception &e) {
+				CLog::logf(CLog::Log_IO, 2, "CCatFile::LoadDatFile() unable to malloc data storage: %s, %d (%s)", c->sFile.c_str(), c->lSize, e.what());
+				continue;
+			}
+			try {
+				File.read((char *)c->sData, c->lSize);
+			}
+			catch(std::exception &e) {
+				CLog::logf(CLog::Log_IO, 2, "CCatFile::LoadDatFile() unable to read file data: %s, %d (%s)", c->sFile.c_str(), c->lSize, e.what());
+				continue;
+			}
-			DecryptDAT(c);
+			this->DecryptDAT(c);
+		}
-		fclose ( id );
+		File.close();
+	}
+}
 bool CCatFile::ReadFiles ()
+{
 		else if ( m_sData[num] == ' ' )
 			spacePos = num;
 		++num;
+	}
-	/*
-	CyString s((const char*)m_sData);
-	CyString *lines = s.SplitToken ( '\n', &num );
-	for ( int i = 1; i < num; i++ )
-	{
-		CyString l = lines[i];
-		if ( l.NumToken ( ' ' ) <= 1 )
-			continue;
-		SInCatFile *catfile = new SInCatFile;
-		catfile->lSize = l.GetToken ( l.NumToken ( ' ' ), ' ' ).ToLong();
-		catfile->sFile = l.GetToken ( 0, l.NumToken ( ' ' ) - 1, ' ' );
-		catfile->lOffset = offset;
-		catfile->sData = 0;
-		offset += catfile->lSize;
-		m_lFiles.push_back ( catfile );
-	}
-*/
 	return true;
+}
 bool CCatFile::DecryptData ( unsigned char *data, size_t size )
+{
 	return true;
+}
 bool CCatFile::DecryptData ()
+{
-	if ( !DecryptData ( m_sData, m_lSize ) )
+	if ( !DecryptData ( m_sData, m_lSize ) ) return false;
-		return false;
 	m_iDataType = CATERR_DECRYPT;
 	return true;
+}
 void CCatFile::RemoveData ()
+{
-	if ( m_sData )
-		delete m_sData;
+	if ( m_sData ) delete m_sData;
 	m_sData = NULL;
 	m_iDataType = CATFILE_NONE;
 	m_lSize = 0;
+}
 unsigned char *CCatFile::ReadData ( SInCatFile *c, size_t *size )
+{
 	*size = c->lSize;
-	FILE *id = fopen ( m_fDatFile.GetFullFilename().c_str(), "rb" );
+	std::fstream File(m_fDatFile.GetFullFilename().c_str(), std::ios::in | std::ios::binary);
+	if ( File.is_open() ) {
+		File.seekg(c->lOffset, std::ios::beg);
+		unsigned char *data;
-	if ( id )
+		try {
+			data = new unsigned char[c->lSize + 1];
-	{
+		}
-		fseek ( id, (long)c-&gt;lOffset, SEEK_SET );
+		catch(std::exception &amp;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();
+			return NULL;
+		}
+		try {
-		unsigned char *data = new unsigned char[c->lSize + 1];
+			File.read((char *)data, c->lSize);
+		}
-		fread ( data, sizeof(unsigned char), c-&gt;lSize, id );
+		catch(std::exception &amp;e) {
+			CLog::logf(CLog::Log_IO, 2, "CCatFile::ReadData() unable to read file data: %s, %d (%s)", c->sFile.c_str(), c->lSize, e.what());
+			File.close();
+			return NULL;
+		}
+		File.close();
 		*size = c->lSize;
 		data[c->lSize] = '\0';
 		DecryptDAT(data, c->lSize);
 		c->bDecrypted = true;
-		fclose ( id );
 		return data;
+	}
 	return NULL;

Subversion Repositories spk

(root)//libspk/src/CatFile.cpp – Rev 42 → 51