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

 	return true;
+}
-bool C_File::readFromFile(CFileIO &File, long lSize, bool bDoSize)
+bool C_File::readFromFile(CFileIO &File)
+{
-	return this->readFromFile(File.stream(), lSize, bDoSize);
+	return readFromFile(File, File.fileSize(), false);
+}
-bool C_File::readFromFile(std::fstream &stream, long lSize, bool bDoSize)
+bool C_File::readFromFile(CFileIO &File, int iSize, bool bDoSize)
 {
+	if ( !File.isOpened() ) File.startRead();
+	if ( !File.isOpened() ) return false;
-	m_lDataSize = lSize;
+	m_lDataSize = File.fileSize();
 	try {
 		m_sData = new unsigned char[m_lDataSize];
 	}
-	catch(std::exception &e) {
-		CLog::logf(CLog::Log_IO, 2, "C_File::readFromFile() unable to malloc, %d (%s)", lSize, e.what());
-		return false;
-	}
-	if ( bDoSize ) {
-		unsigned char s[4];
-		stream.read((char *)s, 4);
-	}
-	try {
-		stream.read((char *)m_sData, m_lDataSize);
-	}
 	catch(std::exception &e) {
-		CLog::logf(CLog::Log_IO, 2, "C_File::readFromFile() unable to read from file, %d (%s)", lSize, e.what());
+		CLog::logf(CLog::Log_IO, 2, "C_File::readFromFile() unable to malloc, %d (%s)", File.fileSize(), e.what());
-		DeleteData ();
-		m_lDataSize = 0;
 		return false;
-	}
-	return true;
-}
-/*
-	Func:	ReadFromFile
-	Accept:	id		- File Pointer Stream of open file
-			size	- amount of data to read from file
-			dosize	- Read the 4 character size
-	Func:	Reads a data stream from a currently open file
-			Can be used to read directly from a SPK Package
-			dosize will read the initial 4 character uncompressed size if needed
-*/
-bool C_File::ReadFromFile ( FILE *id, long size, bool dosize )
-{
-	// remove data
-	m_lDataSize = size ;
-	m_sData = new unsigned char[m_lDataSize];
-	if ( dosize )
-	{
-		unsigned char s[4];
-		fread ( s, sizeof(unsigned char), 4, id );
+	}
-	fread ( m_sData, sizeof(unsigned char), m_lDataSize, id );
+	if ( bDoSize ) File.readSize();
+	try {
-	if ( ferror (id) )
+		File.read(m_sData, m_lDataSize);
-	{
+	}
+	catch(std::exception &e) {
+		CLog::logf(CLog::Log_IO, 2, "C_File::readFromFile() unable to read from file, %d (%s)", File.fileSize(), e.what());
 		DeleteData ();
 		m_lDataSize = 0;
 		return false;
+	}
 	return true;
+}
 void C_File::copyData(const unsigned char *data, size_t size)
+{
 	m_lDataSize = (long)size;
 	delete m_sData;
 	Func:	ReadFileSize()
 	Return:	Returns the file size read
 	Desc:	Opens the file and seeks to the end
 */
 long C_File::ReadFileSize ()
 {
 	CFileIO File(GetFilePointer());
 	if ( File.exists() ) m_lSize = File.fileSize();
 	m_lUncomprDataSize = m_lSize;
+}
 bool C_File::CheckValidFilePointer ()
+{
 	return CFileIO::Exists(GetFilePointer().ToString());
 }
 bool C_File::ReadSignedFile()
+{
 	if ( (m_iFileType != FILETYPE_SCRIPT) && (m_iFileType != FILETYPE_UNINSTALL) )
 		return false;
 	else if ( (m_sData) && (m_iDataCompression == SPKCOMPRESS_NONE) )
 		return ::ReadSignedFromData ( m_sData, m_lDataSize );
 	else
+	{
 		unsigned char pData[5001];
 		CFileIO File(file);
 		int iAmount = (File.fileSize() > 5000) ? 5000 : File.fileSize();
 		if ( File.startRead() ) {
 			File.seekStart(File.fileSize() - iAmount);
 			if ( File.read(pData, iAmount, true) ) {
+}
 int C_File::ReadScriptVersion ()
+{
 	if ( (m_iFileType != FILETYPE_SCRIPT) && (m_iFileType != FILETYPE_UNINSTALL) ) return 0;
 	if ( (m_sData) && (m_iDataCompression == SPKCOMPRESS_NONE) )
 		m_iVersion = ::ReadScriptVersionFromData ( m_sData, m_lDataSize );
 	else {
 		CFileIO File(GetFilePointer());
 		if ( File.startRead() ) {
+			}
+		}
+	}
 	return m_iVersion;
 }
 bool C_File::MatchFile ( C_File *file )
+{
 	if ( file->GetFileType() != m_iFileType )
 		return false;
 			return false;
 		file = "tempuncompr.dat";
+	}
 	bool ret = false;
 	FILE *fIn = fopen(file.c_str(), "rb");
 	if ( fIn )
+	{
 		FILE *fOut = fopen("tempcompr.dat", "wb");
 		if ( fOut )
 						m_iDataCompression = SPKCOMPRESS_ZLIB;
 						ret = true;
+					}
+				}
 				File.close();
 			}
 		}
 		fclose(fIn);
+	}
 	CFileIO::Remove("tempuncompr.dat");
 		filen = filen.findReplace ( "\\\\", "\\" );
 		if ( len && data ) {
 			CFileIO File(filen);
 			if ( File.startWrite() ) ret = File.write(data, len);
 		}
 	}
 	return ret;
 }
 CyString C_File::GetFullFileToDir ( CyString dir, bool includedir, CBaseFile *file )
+{
 	CyString fullfile = dir;
 	if ( includedir )
+	{
 				fullfile += "/";
 			fullfile += d;
+		}
+	}
 	if ( !m_sName.Empty() )
 	{
 		if ( !fullfile.Empty() )
 			fullfile += "/";
 		fullfile += m_sName;
+	}
 	fullfile = fullfile.FindReplace ( "\\", "/" );
 	return fullfile;
+}
 CyString C_File::GetDataSizeString ()
+{
 	return SPK::GetSizeString ( m_lDataSize );
 }
 CyString C_File::GetUncompressedSizeString ()
+{
 	return SPK::GetSizeString ( GetUncompressedDataSize() );
+}
 CyString C_File::GetCreationTimeString ()
+{
 	if ( !m_tTime )
 		return NullString;
 	struct tm   *currDate;
 	char    dateString[100];
 	time_t n = m_tTime;
 	currDate = localtime(&n);
 	strftime(dateString, sizeof dateString, "(%d/%m/%Y) %H:%M", currDate);
 	return CyString(dateString);
+}
 bool C_File::CompareNew ( C_File *file )
+{
 	// if version, check if its later version
 	if ( (m_iVersion) && (file->GetVersion()) )
+	{
 		if ( m_iVersion > file->GetVersion() )
 			return false;
 	}
 	// now check for last modified time
 	if ( (m_tTime) && (file->GetLastModified()) )
+	{
 		if ( m_tTime > file->GetLastModified() )
 			return "ShipModel";
 		case FILETYPE_SHIPSCENE:
 			return "ShipScene";
 		case FILETYPE_COCKPITSCENE:
 			return "CockpitScene";
 	}
 	return NullString;
+}
 int GetFileTypeFromString ( CyString type )
 			m_bUsedMalloc = false;
 			m_sData = new unsigned char[size];
 			memcpy(m_sData, data, size);
 			m_lDataSize = (long)size;
 			delete []data;
+			return true;
+		}
-		return true;
+	}
 	return false;
+}

Subversion Repositories spk

(root)//libspk/src/File.cpp – Rev 56 → 58