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

 	return this->ReadFromFile(GetFilePointer().c_str());
+}
 bool C_File::ReadFromFile (CyString filename)
+{
-	FILE *id = fopen ( filename.c_str(), "rb" );
+	CFileIO File(filename);
-	if ( !id )
+	if ( !File.startRead() ) {
-	{
 		m_iLastError = SPKERR_FILEOPEN;
 		return false;
-	}
-	if ( !m_lSize )
-	{
-		fseek ( id, 0, SEEK_END );
-		m_lSize = ftell ( id );
-		rewind ( id );
 	}
 	m_iDataCompression = SPKCOMPRESS_NONE;
 	m_lDataSize = m_lUncomprDataSize = m_lSize;
 	DeleteData ();
-	m_sData = new unsigned char[m_lSize];
+	m_sData = File.readAll((size_t *)&m_lSize);
-	if ( !m_sData ) { fclose ( id ); m_iLastError = SPKERR_MALLOC; return false; }
-	fread ( m_sData, sizeof(unsigned char), m_lSize, id );
-	if ( ferror(id) )
+	if ( !m_sData ) {
-	{
-		m_iLastError = SPKERR_FILEREAD;
+		m_iLastError = SPKERR_MALLOC;
-		DeleteData ();
 		m_lDataSize = 0;
-		fclose ( id );
 		return false;
+	}
+	m_lDataSize = m_lSize;
+	m_tTime = File.modifiedTime();
 	m_iLastError = SPKERR_NONE;
-	struct stat fileStat;
-	if ( !stat(GetFilePointer().c_str(), &fileStat) )
-		m_tTime = fileStat.st_atime;
 	m_bLoaded = true;
-	fclose ( id );
+	File.close();
 	return true;
+}
 /*
 	Func:	ReadFromData
 	return true;
+}
+bool C_File::readFromFile(CFileIO &File, long lSize, bool bDoSize)
+{
+	return this->readFromFile(File.stream(), lSize, bDoSize);
+}
 bool C_File::readFromFile(std::fstream &stream, long lSize, bool bDoSize)
+{
 	m_lDataSize = lSize;
 	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) {
 			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 ( ferror (id) )
+	{
 		DeleteData ();
 		m_lDataSize = 0;
 	return true;
+}
 void C_File::copyData(const unsigned char *data, size_t size)
 {
 	m_lDataSize = (long)size;
 	delete m_sData;
 	m_sData = new unsigned char[size];
 	memcpy(m_sData, data, size);
+}
 	Func:	ReadFileSize()
 	Return:	Returns the file size read
 	Desc:	Opens the file and seeks to the end
 */
 long C_File::ReadFileSize ()
 {
-	FILE *id = fopen ( GetFilePointer().c_str(), "rb" );
+	CFileIO File(GetFilePointer());
-	if ( id )
-	{
-		fseek ( id, 0, SEEK_END );
-		m_lSize = ftell ( id );
+	if ( File.exists() ) m_lSize = File.fileSize();
-		fclose ( id );
-	}
 	m_lUncomprDataSize = m_lSize;
 	return m_lSize;
+}
 /*
 	Func:	ReadLastModifed()
 	Desc:	Reads the last modified time of the file and returns
 			Uses seperate rountines for Windows and Linux
 */
 time_t C_File::ReadLastModified ()
 {
 	CyString file = GetFilePointer();
 	if ( file.Empty() )
 		return m_tTime;
 	#ifndef _WIN32
 	return m_tTime;
+}
 bool C_File::CheckValidFilePointer ()
+{
-	CyString filename = GetFilePointer();
+	return CFileIO::Exists(GetFilePointer().ToString());
-	if ( filename.Empty() )
-		return false;
-	FILE *id = fopen ( filename.c_str(), "rb+" );
-	if ( !id )
-		return false;
-	fclose ( id );
-	return true;
+}
 bool C_File::ReadSignedFile()
+{
 	if ( (m_iFileType != FILETYPE_SCRIPT) && (m_iFileType != FILETYPE_UNINSTALL) )
 */
 bool C_File::CompressFile ( CProgressInfo *progress )
+{
 	CyString file = this->GetFilePointer();
-	if ( !CFileIO(this->GetFilePointer()).Exists() )
+	if ( !CFileIO(this->GetFilePointer()).exists() )
+	{
 		if ( !this->WriteToFile("tempuncompr.dat", m_sData, m_lDataSize) )
 			return false;
 		file = "tempuncompr.dat";
+	}
 					fclose(id);
+				}
+			}
+		}
-		CFileIO("tempcompr.dat").Remove();
+		CFileIO::Remove("tempcompr.dat");
 		fclose(fIn);
+	}
-	CFileIO("tempuncompr.dat").Remove();
+	CFileIO::Remove("tempuncompr.dat");
 	return ret;
+}
 bool C_File::ChangeCompression ( int compressionType, CProgressInfo *progress )

Subversion Repositories spk

(root)//libspk/src/File.cpp – Rev 51 → 52