From e3541dcc06bc55be159953e2c3478764821d72fe Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 14 Jun 2016 22:59:48 +0200 Subject: [PATCH] Changed: Use toString to format string --HG-- branch : develop --- code/ryzom/tools/patch_gen/patch_gen_common.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/ryzom/tools/patch_gen/patch_gen_common.cpp b/code/ryzom/tools/patch_gen/patch_gen_common.cpp index 27f5e9251..8ba0d4c5e 100644 --- a/code/ryzom/tools/patch_gen/patch_gen_common.cpp +++ b/code/ryzom/tools/patch_gen/patch_gen_common.cpp @@ -49,9 +49,10 @@ void normalisePackageDescriptionFileName(std::string& fileName) void GeneratePatch(const std::string& srcFileName,const std::string& destFileName,const std::string& patchFileName) { - std::string cmd="xdelta delta"; - cmd+=" "+srcFileName+" "+destFileName+" "+patchFileName; - nlinfo("executing system command: %s",cmd.c_str()); + std::string cmd = toString("xdelta delta %s %s %s", srcFileName.c_str(), destFileName.c_str(), patchFileName.c_str()); + + nlinfo("Executing system command: %s", cmd.c_str()); + #ifdef NL_OS_WINDOWS _spawnlp(_P_WAIT, "xdelta.exe", "xdelta.exe", "delta", srcFileName.c_str(), destFileName.c_str(), patchFileName.c_str(), NULL); #else // NL_OS_WINDOWS @@ -65,9 +66,10 @@ void GeneratePatch(const std::string& srcFileName,const std::string& destFileNam void ApplyPatch(const std::string& srcFileName,const std::string& destFileName,const std::string& patchFileName=std::string()) { - std::string cmd="xdelta patch"; - cmd+=" "+patchFileName+" "+srcFileName+" "+destFileName; - nlinfo("executing system command: %s",cmd.c_str()); + std::string cmd = toString("xdelta patch %s %s %s", patchFileName.c_str(), srcFileName.c_str(), destFileName.c_str()); + + nlinfo("Executing system command: %s", cmd.c_str()); + #ifdef NL_OS_WINDOWS _spawnlp(_P_WAIT, "xdelta.exe", "xdelta.exe", "patch",patchFileName.c_str(), srcFileName.c_str(), destFileName.c_str(), NULL); #else // NL_OS_WINDOWS