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

added param to folderIterator to skip/follow symbolic links

Browse source
This commit is contained in:
csoler 2016-11-16 21:41:32 +01:00
parent 608d0d0a65
commit 6272856b5e
7 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/file_sharing/directory_updater.cc
View file

@ -141,7 +141,7 @@ void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_p
// make sure list of subfiles is the same
// request all hashes to the hashcache
librs::util::FolderIterator dirIt(cumulated_path);
librs::util::FolderIterator dirIt(cumulated_path,false);
time_t dir_local_mod_time ;
if(!mSharedDirectories->getDirectoryLocalModTime(indx,dir_local_mod_time))

4
libretroshare/src/file_sharing/hash_cache.cc
View file

@ -145,7 +145,9 @@ void HashStorage::data_tick()
if(job.client->hash_confirm(job.client_param))
{
#ifdef HASHSTORAGE_DEBUG
std::cerr << "Hashing file " << job.full_path << "..." ; std::cerr.flush();
#endif
std::string tmpout;
rs_sprintf(tmpout, "%lu/%lu (%s - %d%%) : %s", (unsigned long int)mHashCounter+1, (unsigned long int)mTotalFilesToHash, friendlyUnit(mTotalHashedSize).c_str(), int(mTotalHashedSize/double(mTotalSizeToHash)*100.0), job.full_path.c_str()) ;
@ -156,7 +158,9 @@ void HashStorage::data_tick()
{
// store the result
#ifdef HASHSTORAGE_DEBUG
std::cerr << "done."<< std::endl;
#endif
RS_STACK_MUTEX(mHashMtx) ;
HashStorageInfo& info(mFiles[job.full_path]);