Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-14 00:55:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed file rename by using a common rsDirUtil function

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1103 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-03-29 13:58:28 +00:00
parent b3f433b5f2
commit 9b59f89cdf
6 changed files with 82 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libretroshare/src/services/p3distrib.cc
View file

@ -31,6 +31,8 @@
#include "services/p3distrib.h"
#include "serialiser/rsdistribitems.h"
#include "util/rsdir.h"
#include "pqi/pqinotify.h"
#include "pqi/pqibin.h"
/*****
@ -788,18 +790,16 @@ void p3GroupDistrib::locked_publishPendingMsgs()
mPendingPublish.clear();
delete streamer;
if(!RsDirUtil::renameFile(filenametmp,filename))
{
std::ostringstream errlog;
#ifdef WIN32
std::wstring from,to ;
for(std::string::const_iterator it = filenametmp.begin(); it!=filenametmp.end();++it) from += *it;
for(std::string::const_iterator it = filename .begin(); it!=filename .end();++it) to += *it;
if(!MoveFileEx(from.c_str(), to.c_str(), MOVEFILE_REPLACE_EXISTING))
errlog << "Error " << GetLastError() ;
#else
if(0 != rename(filenametmp.c_str(),filename.c_str()))
errlog << "Error " << errno ;
#endif
std::cerr << "Could not rename file " << filenametmp << " into " << filename << std::endl ;
else
std::cerr << "Successfull wrote file " << filename << std::endl ;
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error "+errlog.str());
}
/* indicate not to save for a while */
mLastPublishTime = now;
@ -933,18 +933,16 @@ void p3GroupDistrib::publishDistribGroups()
/* cleanup */
delete streamer;
if(!RsDirUtil::renameFile(filenametmp,filename))
{
std::ostringstream errlog;
#ifdef WIN32
std::wstring from,to ;
for(std::string::const_iterator it = filenametmp.begin(); it!=filenametmp.end();++it) from += *it;
for(std::string::const_iterator it = filename .begin(); it!=filename .end();++it) to += *it;
if(!MoveFileEx(from.c_str(), to.c_str(), MOVEFILE_REPLACE_EXISTING))
errlog << "Error " << GetLastError() ;
#else
if(0 != rename(filenametmp.c_str(),filename.c_str()))
errlog << "Error " << errno ;
#endif
std::cerr << "Could not rename file " << filenametmp << " into " << filename << std::endl ;
else
std::cerr << "Successfull wrote file " << filename << std::endl ;
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error "+errlog.str());
}
/* push file to CacheSource */
refreshCache(newCache);