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

merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-03-29 14:18:05 +00:00
parent 0e6302ac6a
commit 1042744685
53 changed files with 2387 additions and 1904 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/util/rsdir.cc
View file

@ -294,7 +294,7 @@ bool RsDirUtil::copyFile(const std::string& source,const std::string& dest)
}
bool RsDirUtil::checkFile(const std::string& filename,bool disallow_empty_file)
bool RsDirUtil::checkFile(const std::string& filename,uint64_t& file_size,bool disallow_empty_file)
{
int val;
mode_t st_mode;
@ -327,6 +327,8 @@ bool RsDirUtil::checkFile(const std::string& filename,bool disallow_empty_file)
return false;
}
file_size = buf.st_size ;
if(disallow_empty_file && buf.st_size == 0)
return false ;

2
libretroshare/src/util/rsdir.h
View file

@ -85,7 +85,7 @@ int breakupDirList(const std::string& path, std::list<std::string> &subdirs
bool copyFile(const std::string& source,const std::string& dest);
bool fileExists(const std::string& file);
bool checkFile(const std::string& filename,bool disallow_empty_file = false);
bool checkFile(const std::string& filename,uint64_t& file_size,bool disallow_empty_file = false);
bool checkDirectory(const std::string& dir);
bool checkCreateDirectory(const std::string& dir);