aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-20 06:06:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: #1385 patch_gen uses tmpnam function instead of 'nul' for files with no pre-existing version. Note - used tmpnam instead of mkstemp due to cross-platform compatibility.

Browse source
This commit is contained in:
sfb 2011-12-12 14:38:41 -06:00
parent 68102d53e5
commit 25b23914e8
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/ryzom/tools/patch_gen/patch_gen_common.cpp
View file

@ -18,8 +18,11 @@
// includes // includes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <cstdio>
#include "game_share/bnp_patch.h" #include "game_share/bnp_patch.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/file.h"
#include "nel/misc/command.h" #include "nel/misc/command.h"
#include "nel/misc/sstring.h" #include "nel/misc/sstring.h"
#include "game_share/singleton_registry.h" #include "game_share/singleton_registry.h"
@ -320,7 +323,6 @@ void CPackageDescription::generatePatches(CBNPFileSet& packageIndex) const
for (uint32 i=packageIndex.fileCount();i--;) for (uint32 i=packageIndex.fileCount();i--;)
{ {
bool deleteRefAfterDelta= true;
// generate file name root // generate file name root
std::string bnpFileName= _BnpDirectory+packageIndex.getFile(i).getFileName(); std::string bnpFileName= _BnpDirectory+packageIndex.getFile(i).getFileName();
std::string refNameRoot= _RefDirectory+NLMISC::CFile::getFilenameWithoutExtension(bnpFileName); std::string refNameRoot= _RefDirectory+NLMISC::CFile::getFilenameWithoutExtension(bnpFileName);
@ -340,8 +342,9 @@ void CPackageDescription::generatePatches(CBNPFileSet& packageIndex) const
std::string prevVersionFileName; std::string prevVersionFileName;
if (packageIndex.getFile(i).versionCount()==1) if (packageIndex.getFile(i).versionCount()==1)
{ {
prevVersionFileName= "nul"; prevVersionFileName= tmpnam(NULL);
deleteRefAfterDelta= false; NLMISC::COFile tmpFile(prevVersionFileName);
tmpFile.close();
} }
else else
{ {
@ -400,7 +403,7 @@ void CPackageDescription::generatePatches(CBNPFileSet& packageIndex) const
} }
// if we have a ref file still hanging about from the previous patch then delete it // if we have a ref file still hanging about from the previous patch then delete it
if (prevVersionFileName!= "nul" && NLMISC::CFile::fileExists(prevVersionFileName)) if (NLMISC::CFile::fileExists(prevVersionFileName))
{ {
NLMISC::CFile::deleteFile(prevVersionFileName); NLMISC::CFile::deleteFile(prevVersionFileName);
} }