Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +17 -10
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7ac533b0c3 - Show all commits

27
src/filesystem.cpp
View file

@ -241,10 +241,16 @@ namespace fc {
void remove_all( const path& p ) { boost::filesystem::remove_all(p); }
void copy( const path& f, const path& t ) {
try {
boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t) );
boost::system::error_code ec;
boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t), ec );
if( ec )
{
FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${code} : ${message}",
("srcfile",f)("dstfile",t)("code",ec.value())("message",ec.message()) );
}
} catch ( boost::system::system_error& e ) {
FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${reason}",
("srcfile",f)("dstfile",t)("reason",e.what() ) );
("srcfile",f)("dstfile",t)("reason",std::string(e.what()) ) );
} catch ( ... ) {
FC_THROW( "Copy from ${srcfile} to ${dstfile} failed",
("srcfile",f)("dstfile",t)("inner", fc::except_str() ) );
@ -258,7 +264,7 @@ namespace fc {
catch ( boost::system::system_error& e )
{
FC_THROW( "Resize file '${f}' to size ${s} failed: ${reason}",
("f",f)("s",t)( "reason", e.what() ) );
("f",f)("s",t)( "reason", std::string(e.what()) ) );
}
catch ( ... )
{
@ -297,13 +303,14 @@ namespace fc {
void rename( const path& f, const path& t ) {
try {
boost::filesystem::rename( boost::filesystem::path(f), boost::filesystem::path(t) );
} catch ( boost::system::system_error& ) {
try{
boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t) );
boost::filesystem::remove( boost::filesystem::path(f));
} catch ( boost::system::system_error& e ) {
FC_THROW( "Rename from ${srcfile} to ${dstfile} failed because ${reason}",
("srcfile",f)("dstfile",t)("reason",e.what() ) );
} catch ( boost::system::system_error& er ) {
try {
copy( f, t );
remove( f );
} catch ( fc::exception& e ) {
FC_RETHROW_EXCEPTION( e, error,
"Rename from ${srcfile} to ${dstfile} failed due to ${reason}, trying to copy then remove",
("srcfile",f)("dstfile",t)("reason",std::string(er.what())) );
}
} catch ( ... ) {
FC_THROW( "Rename from ${srcfile} to ${dstfile} failed",