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

 		archive = new CSpkFile(); // converting to a spk file
 	HeaderData.CmtBuf=NULL;
 	memset(&OpenArchiveData.Reserved,0,sizeof(OpenArchiveData.Reserved));
+	CDirIO outputDir(m_sTempDir + L"/Extract");
+	if (!outputDir.exists())
+		outputDir.create();
 	bool error = false;
-	Utils::WString extractedFile = CDirIO(m_sTempDir).file(L"extracted.tst").findReplace(L"/", L"\\").findReplace(L"\\\\", L"\\");
 	while ((RHCode=RARReadHeaderEx(hArcData,&HeaderData))==0)
+	{
 		Utils::WString fileName(HeaderData.FileNameW);
 		if ( HeaderData.FileAttr == 16 )
 			continue;
-		PFCode=RARProcessFileW(hArcData, RAR_EXTRACT, NULL, NULL);
+		PFCode = RARProcessFileW(hArcData, RAR_EXTRACT, outputDir.dir(), NULL);
 		if (PFCode!=0)
+		{
 			error = true;
 			break;
+		}
-		CFileIO File(fileName);
+		CFileIO File(outputDir.file(fileName));
 		if ( File.exists() )
+		{
 			if ( fileName.Compare(L"pluginmanager.txt") )
 				this->readArchiveData(File.fullFilename(), archive);
 			else
 					f = archive->addFile(CFileIO(fileName).filename(), CFileIO(fileName).dir(), FILETYPE_EXTRA);
 				else
 					f = archive->addFile(CFileIO(fileName).filename(), extradir, static_cast<FileType>(type));
 				f->readFromFile(File.fullFilename());
+			}
 			File.remove();
+		}
+	}
 	RARCloseArchive(hArcData);
+	if (outputDir.exists())
+		outputDir.removeDir(L".", true, true);
 	if ( error )
+	{
 		delete archive;
 		archive = NULL;

Subversion Repositories spk