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

 	return false;
+}
 int C_File::ReadScriptVersion ()
+{
-	if ( (m_iFileType != FILETYPE_SCRIPT) && (m_iFileType != FILETYPE_UNINSTALL) )
+	if ( (m_iFileType != FILETYPE_SCRIPT) && (m_iFileType != FILETYPE_UNINSTALL) ) return 0;
-		return 0;
-	// check file pointer
-	CyString file = GetFilePointer();
-	// check file extenstion
-	if ( (CFileIO(file).CheckFileExtension("pck")) || (CheckPCK()) )
-	{
-		size_t size = 0;
-		unsigned char *data = UnPCKFile ( &size );
-		if ( (data) && (size) )
-			m_iVersion = ::ReadScriptVersionFromData ( data, (long)size );
-	}
-	else if ( (m_sData) && (m_iDataCompression == SPKCOMPRESS_NONE) )
+	if ( (m_sData) && (m_iDataCompression == SPKCOMPRESS_NONE) )
 		m_iVersion = ::ReadScriptVersionFromData ( m_sData, m_lDataSize );
-	else
+	else {
-	{
-		FILE *id = fopen ( file.c_str(), "rb+" );
-		if ( id )
-		{
-			fclose ( id );
-			std::string line;
-			std::ifstream myfile ( file.c_str() );
+		CFileIO File(GetFilePointer());
-			if ( myfile.is_open() )
+		if ( File.startRead() ) {
-			{
-				bool inscript = false;
-				while (! myfile.eof() )
-				{
-					std::getline ( myfile, line );
+			int iRead = (File.fileSize() > 5000) ? 5000 : File.fileSize();
-					while ( line[0] == ' ' )
-						line.erase ( 0, 1 );
-					CyString sLine = line;
+			unsigned char *data = File.read(iRead);
-					if ( !inscript )
+			if ( data ) {
-					{
-						if ( sLine.GetToken ( 1, '>' ) == "<script" )
-							inscript = true;
-					}
-					else
-					{
-						if ( sLine.GetToken ( 1, '>' ) == "<version" )
-						{
-							m_iVersion = sLine.GetToken ( 2, '>' ).GetToken ( 1, '<' ).ToInt();
+				m_iVersion = ::ReadScriptVersionFromData(data, iRead);
-							break;
+				delete []data;
-						}
-					}
-				}
-				myfile.close();
+			}
+		}
+	}
 	return m_iVersion;
+}
 bool C_File::MatchFile ( C_File *file )
+{
 	if ( file->GetFileType() != m_iFileType )
 		return false;
 	if ( file->GetDir() != m_sDir )
 		return false;
 	if ( file->GetName() != m_sName )
 		return false;
 	return true;
+}
 			fclose(fOut);
 			if ( err == Z_OK )
+			{
 				DeleteData ();
-				FILE *id = fopen ( "tempcompr.dat", "rb" );
+				CFileIO File("tempcompr.dat");
-				if ( id )
-				{
-					fseek ( id, 0, SEEK_END );
+				File.setAutoDelete(true);
-					m_lDataSize = ftell ( id );
+				if ( File.startRead() ) {
-					rewind ( id );
-					m_sData = new unsigned char[m_lDataSize];
+					m_sData = File.readAll((size_t *)&m_lDataSize);
-					if ( !m_sData ) { fclose ( id ); m_iLastError = SPKERR_MALLOC; }
-					else
-					{
-						fread ( m_sData, sizeof(unsigned char), m_lDataSize, id );
-						if ( ferror(id) )
+					if ( !m_sData ) {
-						{
-							m_iLastError = SPKERR_FILEREAD;
+						m_iLastError = SPKERR_FILEREAD;
-							DeleteData ();
-							m_lDataSize = 0;
+						m_lDataSize = 0;
-						}
+					}
-						else
+					else {
-						{
-							ret = true;
-							m_iLastError = SPKERR_NONE;
+						m_iLastError = SPKERR_NONE;
-							m_iDataCompression = SPKCOMPRESS_ZLIB;
+						m_iDataCompression = SPKCOMPRESS_ZLIB;
-						}
+						ret = true;
+					}
-					fclose(id);
+				}
+				File.close();
+			}
+		}
-		CFileIO::Remove("tempcompr.dat");
 		fclose(fIn);
+	}
 	CFileIO::Remove("tempuncompr.dat");
 		return false;
 	// laready compressed to correct type
 	if ( compressionType == m_iDataCompression )
 		return true;
 	// otherwise, lets recompress the file
 	// first we uncompress the data
 	if ( !this->UncompressData(progress) )
 		return false;
 						break;
+				}
 				// if its compressed ok, remove old data and use new one
 				if ( err == Z_OK )
 				{
 					unsigned char *retData = new unsigned char[comprLen];
 					(*outSize) = comprLen;
 					memcpy(retData, compr, comprLen);
 					free(compr);
 					return retData;
 				}
 				free(compr);
 				return NULL;
+			}
 			break;
 		case SPKCOMPRESS_LZMA:
 	if ( compressionType == SPKCOMPRESS_ZLIB && (this->CheckFileExt("pck") || this->CheckFileExt("cat") || this->CheckFileExt("dat") || this->CheckFileExt("pbb") || this->CheckFileExt("pbd")) )
 		compressionType = SPKCOMPRESS_LZMA;
 	// if its already compressed, no need to compress again
 	if ( compressionType == m_iDataCompression )
 		return true;
 	// no need to change the compression
 	if ( m_iDataCompression != SPKCOMPRESS_NONE )
 		return true;
 	m_lUncomprDataSize = m_lDataSize;
 					delete compr;
+			}
+		}
 		if ( bestCompress != -1 && bestCompr )
 		{
 			DeleteData ();
 			m_sData = bestCompr;
 			m_bUsedMalloc = false;
 			m_lDataSize = bestSize;
 			m_iDataCompression = bestCompress;
 			return true;
 	return false;
+}
 bool C_File::UncompressData ( CProgressInfo *progress )
 {
 	// no data to try to uncompress
 	if ( (!m_sData) || (!m_lDataSize) ) {
 		return (m_lSize) ? false : true;
+	}
+}
 bool C_File::WriteToFile ( CyString filename, unsigned char *cData, long len )
+{
 	unsigned char *data = cData;
-	if ( (!len) || (!data) )
+	if ( (!len) || (!data) ) {
-	{
 		len = m_lDataSize;
 		data = m_sData;
+	}
 	if ( (!len) || (!data) ) {
 		if ( m_lSize ) return false;
 	}
+	bool ret = false;
 	// check for cat file
-	if ( filename.IsIn ( "::" ) )
+	if ( filename.IsIn ( "::" ) ) {
-	{
-		CyString catfile = filename.GetToken ( ";::", 1, 1 );
+		Utils::String catfile = filename.GetToken ( ";::", 1, 1 ).ToString();
-		CyString file = filename.GetToken ( ";::", 2, 2 );
+		Utils::String file = filename.GetToken ( ";::", 2, 2 ).ToString();
 		CCatFile newcat;
 		return newcat.AddData ( catfile, data, len, file, true, true );
 	}
-	else
+	else {
-	{
-		CyString filen = filename.FindReplace ( "/", "\\" );
+		Utils::String filen = filename.FindReplace ( "/", "\\" ).ToString();
-		filen = filen.FindReplace ( "\\\\", "\\" );
+		filen = filen.findReplace ( "\\\\", "\\" );
-		FILE *id = fopen ( filen.c_str(), "wb" );
-		if ( !id )
-			return false;
-		bool ret = true;
 		if ( len && data ) {
-			fwrite ( data, sizeof(unsigned char), len, id );
-			if ( ferror(id) )
-				ret = false;
+			CFileIO File(filen);
-			fclose ( id );
+			if ( File.startWrite() ) ret = File.write(data, len);
+		}
-		return ret;
+	}
-	return false;
+	return ret;
+}
 CyString C_File::GetFullFileToDir ( CyString dir, bool includedir, CBaseFile *file )
+{
 	CyString fullfile = dir;
 bool C_File::CheckPCK ()
+{
 	if ( (m_sData) && (m_lDataSize) && (m_iDataCompression == SPKCOMPRESS_NONE) )
 		return IsDataPCK ( m_sData, m_lDataSize );
-	CyString filename = GetFilePointer();
+	Utils::String filename = GetFilePointer().ToString();
-	if ( !filename.Empty() )
+	if ( !filename.empty() ) {
-	{
-		FILE *id = fopen ( filename.c_str(), "rb+" );
+		CFileIO File(filename);
-		if ( id )
+		if ( File.startRead() ) {
-		{
-			unsigned char data[3];
+			unsigned char data[4];
-			fread ( data, sizeof(unsigned char), 3, id );
-			fclose ( id );
-			return IsDataPCK ( data, 3 );
+			if ( File.read(data, 3) ) return IsDataPCK ( data, 3 );
 		}
 	}
-	if ( CheckFileExt("pck") || CheckFileExt("pbb") || CheckFileExt("pbd") )
+	if ( CheckFileExt("pck") || CheckFileExt("pbb") || CheckFileExt("pbd") ) return true;
-		return true;
 	return false;
+}
 bool C_File::PCKFile()
 {
 	if ( !m_lDataSize || !m_sData )
 	{
 		if ( !this->ReadFromFile() )
 			return false;
 	}
 	if ( m_lDataSize && m_sData )
 	{
 		if ( !this->UncompressData() )
 			return false;
 		size_t size;
 		unsigned char *data = PCKData(m_sData, m_lDataSize, &size, false);
 		if ( data && size )
 		{
 			m_lUncomprDataSize = m_lDataSize;
 			this->DeleteData();
 			m_bUsedMalloc = false;
 			m_lDataSize = (long)size;
 			m_sData = new unsigned char[size];
 			memcpy(m_sData, data, size);
 			delete [] data;
+		}
 		return true;
+	}
 	unsigned char *data = NULL;
 	size_t datasize = 0;
 	if ( CheckValidFilePointer() )
+	{
-		FILE *id = fopen ( GetFilePointer().c_str(), "rb+" );
+		CFileIO File(GetFilePointer().ToString());
-		if ( id )
-		{
-			fseek ( id, 0, SEEK_END );
-			datasize = ftell ( id );
-			rewind ( id );
-			data = new unsigned char[datasize];
-			fread ( data, sizeof(unsigned char), datasize, id );
+		if ( File.startRead() ) data = File.readAll(&datasize);
-			fclose ( id );
-		}
+	}
 	if ( !data )
+	{
 		if ( !m_lDataSize )
 	if ( data )
+	{
 		unsigned char *newdata = UnPCKData ( data, datasize, len, CheckPCK() );
 		delete data;
 		return newdata;
 	}
 	return NULL;
+}
 bool C_File::UnPCKFile()
+{
 	if ( !m_lDataSize || !m_sData )
 	return false;
+}
 unsigned char *UnPCKFile ( const char *file, size_t *len, bool nocrypt )
+{
-	FILE *id = fopen ( file, "rb" );
+	CFileIO File(file);
-	if ( !id )
-		return NULL;
+	if ( !File.startRead() ) return NULL;
-	fseek ( id, 0, SEEK_END );
-	size_t size = ftell ( id );
+	size_t size;
-	fseek ( id, 0, SEEK_SET );
-	unsigned char *data = new unsigned char[size];
+	unsigned char *data = File.readAll(&size);
-	fread ( data, sizeof(unsigned char), size, id );
-	if ( ferror(id) )
-	{
-		delete data;
-		data = NULL;
-	}
-	fclose ( id );
-	if ( data )
+	if ( data ) {
-	{
 		unsigned char *unData = UnPCKData ( data, size, len, nocrypt );
 		delete data;
 		return unData;
+	}
 	return false;
+}
 int ReadScriptVersionFromData ( unsigned char *data, long size )
+{
+	int iVersion = 0;
 	if ( IsDataPCK ( data, size ) )
+	{
 		size_t unpckSize = 0;
 		unsigned char *unpckData = UnPCKData ( data, size, &unpckSize );
-		if ( (unpckData) && (unpckSize) )
+		if ( (unpckData) && (unpckSize) ) {
-			return ReadScriptVersionFromData ( unpckData, (long)unpckSize );
+			iVersion = ReadScriptVersionFromData ( unpckData, (long)unpckSize );
+			delete unpckData;
+		}
-		return 0;
+		return iVersion;
+	}
+	// only check the beginning of the file
+	int iMax = (size > 5000) ? 5000 : size;
 	int pos = 0;
 	bool found = false;
-	int iVersion = 0;
 	// skip past initial space
+	char tag[21];
-	while ( !found )
+	while ( pos < iMax )
+	{
+		// skip past whitespace
-		while ( (pos < size) && (data[pos] == ' ') )
+		while ( (pos < iMax) && (data[pos] == ' ') ) ++pos;
+		// find the first '<'
+		while ( (pos < iMax) && (data[pos] != '<') ) ++pos;
+		if ( data[pos] != '<' ) break; //not found
+		// find end tag '>'
-			++pos;
+		int iStartPos = pos;
+		while ( (pos < iMax) && (data[pos] != '>') ) ++pos;
+		if ( data[pos] != '>' ) break; //not found
+		if ( (pos - iStartPos) > 20 ) continue;
-		if ( data[pos] == '<' )
-		{
-			CyString checktag;
-			while ( (pos < size) && (data[pos] != '>') )
+		// check if the tag is what we're looking for
-			{
-				checktag += (char)data[pos];
+		memcpy(tag, data + iStartPos, pos - iStartPos);
-				++pos;
-			}
-			++pos;
-			if ( checktag == &quot;&lt;version"; )
+		tag[pos - iStartPos] = &apos;\0&apos;;
-			{
-				CyString version;
+		Utils::String sTag(tag);
-				while ( (pos < size) && (data[pos] != '<') )
-				{
-					version += (char)data[pos];
-					++pos;
-				}
-				iVersion = version.ToInt();
+		if ( !sTag.Compare("<version") ) continue;
-				found = true;
-				break;
-			}
-		}
-		if ( found )
+		//extract the tag data
-			break;
-		// skip to next line
+		iStartPos = pos + 1;
-		while ( (pos < size) && (data[pos] != '\n&apos;) )
+		while ( (pos < iMax) && (data[pos] != '<&apos;) ) ++pos;
-			++pos;
+		if ( (pos - iStartPos) > 20 ) continue;
-		++pos;
+		memcpy(tag, data + iStartPos, pos - iStartPos);
-		if ( pos &gt;= size )
+		tag[pos - iStartPos] = &apos;\0';
-			break;
+		return atoi(tag);
+	}
 	return iVersion;
+}

Subversion Repositories spk

(root)//libspk/src/File.cpp – Rev 53 → 54