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

 			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;
-			DecryptDAT(c->sData, c->lSize);
+			DecryptDAT(c);
+		}
 		fclose ( id );
+	}
+}
 	return ReadFileToData ( c );
+}
 bool CCatFile::ReadFileToData ( SInCatFile *c )
+{
-	if ( !c )
-		return false;
+	if ( !c ) return false;
 	size_t size = 0;
-	c->sData = ReadData ( c, &size );
+	if ( !c->sData ) c->sData = ReadData ( c, &size );
-	if ( c->sData )
+	if ( c->sData )	return true;
-		return true;
 	return false;
 }
 unsigned char *CCatFile::ReadData ( SInCatFile *c, size_t *size )
+{
 	*size = c->lSize;
 		fseek ( id, (long)c->lOffset, SEEK_SET );
 		unsigned char *data = new unsigned char[c->lSize + 1];
 		fread ( data, sizeof(unsigned char), c->lSize, id );
 		*size = c->lSize;
 		data[c->lSize] = '\0';
-		DecryptDAT(data, *size);
+		DecryptDAT(data, c->lSize);
+		c->bDecrypted = true;
 		fclose ( id );
 		return data;
+	}
 	return NULL;
+}
+void CCatFile::DecryptDAT(SInCatFile *pFile)
+{
+	if ( pFile->bDecrypted ) return;
+	pFile->bDecrypted = true;
+	this->DecryptDAT(pFile->sData, pFile->lSize);
+}
 void CCatFile::DecryptDAT(unsigned char *buffer, size_t size)
+{
 	for(unsigned char *pos=buffer, *end=buffer + size; pos < end; pos++){
 		*pos^=0x33;
+	}
+	}
 	return NULL;
+}
-unsigned char *CCatFile::UnpackFile ( SInCatFile *c, size_t *size, bool forcepck )
+unsigned char *CCatFile::UnpackFile ( SInCatFile *c, size_t *size)
+{
 	*size = 0;
 	if ( !c )
 		return NULL;
-	if ( IsDataPCK ( (const unsigned char *)c->sData, c->lSize ) || forcepck )
-		return UnPCKData ( c->sData, c->lSize, size );
+	this->DecryptDAT(c);
+	int iFiletype = this->_checkFiletype(c->sData, 3);
+	// plain file
+	if ( iFiletype == FILETYPE_PLAIN ) {
-	*size = c->lSize;
+		*size = c->lSize;
-	return c->sData;
+		return c->sData;
+	}
+	//otherwise unpack it
+//	if ( IsDataPCK ( (const unsigned char *)c->sData, c->lSize ) || forcepck )
+	/*int iOffset = 0;
+	if ( iFiletype == FILETYPE_PCK ) {
+		iOffset = 1;
+		for(size_t i=0; i < c->lSize; i++){
+			c->sData[i] ^= magic;
+		}
+	}
+	return UnPCKData ( c->sData + iOffset, c->lSize - iOffset, size );*/
+	return UnPCKData(c->sData, c->lSize, size, (iFiletype == FILETYPE_PCK) ? true : false);
+}
 bool CCatFile::RemoveFile ( SInCatFile *f )
+{
 	if ( (m_bCreate) || (m_lFiles.empty()) )
 		return false;
 	if ( !f )
 		return false;
 	int err = m_fDatFile.TruncateFile ( f->lOffset, f->lSize );
 	if ( err == FILEERR_TOSMALL )
 	{
 		if ( (int)m_fDatFile.GetFilesize() > this->GetEndOffset() )
 			m_fDatFile.TruncateFile( this->GetEndOffset(), m_fDatFile.GetFilesize() - this->GetEndOffset() );
+	}
 	else if ( err != FILEERR_NONE )
 		return false;
 	// adjust the file positions
 	int iOffset = -1;
 	for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() ) {
 		if ( node->Data() == f ) {
 			iOffset = node->Data()->lOffset;
 	for ( SInCatFile *f = m_lFiles.First(); f; f = m_lFiles.Next() )
+	{
 		if ( f->sFile.Empty() )
 			continue;
 		cat += f->sFile.findreplace("/", "\\") + " " + (long)f->lSize + "\n";
 	}
 	if ( !cat.Length() )
 		return false;
 	size_t len = cat.Length();
 //	if ( len % 5)
 //		len += (5 - (len % 5));
 	unsigned char *data = new unsigned char[len + 1];
 	memcpy ( data, cat.c_str(), cat.Length() );
 	for ( size_t i = len; i > cat.Length(); i-- )
 		data[i] = '\0';
 	else if ( ext == "txt" )
 		return true;
 	else if ( ext == "bob" )
 		return true;
 	else if ( ext == "bod" )
 		return true;
 	return false;
+}
 bool CCatFile::CheckPackedExtension ( CyString filename )
+{
 	CyString ext = filename.GetToken ( ".", filename.NumToken  ( "." ) ).lower();
+}
 CyString CCatFile::PckChangeExtension ( CyString f )
+{
 	CFileIO fo ( f );
 	CyString ext = fo.GetFileExtension ().lower();
 	if ( ext == "txt" )
 		return fo.ChangeFileExtension ( "pck" );
 	else if ( ext == "xml" )
 		return fo.ChangeFileExtension ( "pck" );
 	else if ( ext == "bob" )
 		unsigned char *data = new unsigned char[size + 1];
 		fread ( data, sizeof(unsigned char), size, id );
 		data[size] = '\0';
 		fclose ( id );
+		int iFileType = this->_checkFiletype(data, 3);
-		if ( CheckPackedExtension(to) && !IsDataPCK ( data, size ) )
+		if ( CheckPackedExtension(to) && iFileType == FILETYPE_PLAIN )
+		{
 			size_t newsize = 0;
 			unsigned char *newdata = PCKData ( data, size, &newsize, bXor );
-			this->DecryptDAT(newdata, newsize);
 			f->lSize = newsize;
+			this->DecryptDAT(newdata, f->lSize);
 			append = m_fDatFile.AppendDataToPos ( (const char *)newdata, newsize, f->lOffset );
 			delete [] newdata;
+		}
 		else
+		{
 			this->DecryptDAT(data, size);
 			f->lSize = size;
-			append = m_fDatFile.AppendDataToPos ( (const char *)data, size, f->lOffset );
+			append = m_fDatFile.AppendDataToPos ( (const char *)data, f->lSize, f->lOffset );
+		}
 		delete [] data;
 	}
 	if ( append )
 	{
 		m_bCreate = false;
 		f->sFile = to;
 		m_lFiles.push_back ( f );
 		WriteCatFile ();
 	}
 	else
 		delete f;
 	return true;
 }
 bool CCatFile::AddData ( CyString catfile, unsigned char *data, size_t size, CyString to, bool pck, bool create )
+{
 	int err = Open ( catfile, "", CATREAD_CATDECRYPT, create );
 	if ( (err != CATERR_NONE) && (err != CATERR_CREATED) )
 		return false;
 int CCatFile::GetEndOffset()
+{
 	if ( m_lFiles.empty() )
 		return 0;
 	else
 		return m_lFiles.Back()->Data()->lOffset + m_lFiles.Back()->Data()->lSize;
+}
 bool CCatFile::AppendData ( unsigned char *data, size_t size, CyString to, bool pck, bool bXor )
 	// if file extension is packed but not the file, then pack it, "pck" forces it to be packed unless it already is
 	f->lSize = size;
 	if ( (((pck) && (CheckExtensionPck (to))) || ((CheckPackedExtension ( to )))) && (!IsDataPCK ( data, size )) )
 	{
 		to = PckChangeExtension ( to );
 		if ( !m_lFiles.empty() )
+		{
 			SInCatFile *f = FindData ( to );
 		m_iError = CATERR_NOFILE;
 		return false;
+	}
 	return ExtractFile ( f, to, preserve );
+}
+int CCatFile::_checkFiletype(const unsigned char *pBuffer, int iSize)
+{
+	if(iSize >= 3) {
+		unsigned char magic = pBuffer[0] ^ 0xC8;
+		if( (pBuffer[1] ^ magic) == 0x1F && (pBuffer[2] ^ magic) == 0x8B) {
+			return FILETYPE_PCK;
+		}
+	}
+	if ( iSize >= 2 && (pBuffer[0] == 0x1F && pBuffer[1] == 0x8B) ) {
+		return FILETYPE_DEFLATE;
+	}
+	return FILETYPE_PLAIN;
+}
 bool CCatFile::ExtractFile ( SInCatFile *f, CyString to, bool preserve )
+{
 	unsigned char *data = 0;
 	size_t size = 0;
 	// load the data from file
 	ReadFileToData ( f );
-	data = UnpackFile ( f, &size, CheckPackedExtension(f->sFile) );
+	data = this->UnpackFile(f, &size);
 	if ( !data )
+	{
 		m_iError = CATERR_CANTREAD;
 		return false;
+	}

Subversion Repositories spk

(root)//libspk/src/CatFile.cpp – Rev 40 → 41