diff --git a/CHANGES/v2.0.txt b/CHANGES/v2.0.txt index 26044559e3ce74d2436758df187c67075b13576d..650b8360faa8b3fd281dfcb59492b20e8e092aba 100644 --- a/CHANGES/v2.0.txt +++ b/CHANGES/v2.0.txt @@ -69,7 +69,14 @@ Unreleased changes ------------- See <a href="http://github.com/plumed/plumed2/tree/v2.0">branch v2.0 on git repository</a>. -There are currently no unreleased changes. +For users: +- Added full reference (page/number) to published paper in doc and log. +- Fixed a bug in file backups (only affecting Windows version - thanks to T. Giorgino). +- Several small fixes in documentation and log file. + +For developers: +- Fixed makefile dependencies in some auxiliary files in src/lib (src/lib/*cmake and src/lib/*inc). +- Several small fixes in documentation. */ diff --git a/src/tools/OFile.cpp b/src/tools/OFile.cpp index d24a47d72ce15614a85e7449f82d40fdacc8c226..55f6ac6a950f768ba09df404522a3a5db2ee8d75 100644 --- a/src/tools/OFile.cpp +++ b/src/tools/OFile.cpp @@ -32,6 +32,7 @@ #include <iostream> #include <string> #include <cstdlib> +#include <cerrno> namespace PLMD{ @@ -240,6 +241,7 @@ void OFile::backupFile( const std::string& bstring, const std::string& fname ){ FILE* ff=std::fopen(const_cast<char*>(fname.c_str()),"r"); FILE* fff=NULL; if(ff){ + std::fclose(ff); std::string backup; size_t found=fname.find_last_of("/\\"); std::string directory=fname.substr(0,found+1); @@ -251,12 +253,11 @@ void OFile::backupFile( const std::string& bstring, const std::string& fname ){ backup=directory+bstring +"."+num+"."+file; fff=std::fopen(backup.c_str(),"r"); if(!fff) break; + else std::fclose(fff); } int check=rename(fname.c_str(),backup.c_str()); - plumed_massert(check==0,"renaming "+fname+" into "+backup+" failed for some reason"); + plumed_massert(check==0,"renaming "+fname+" into "+backup+" failed for reason: "+strerror(errno)); } - if(ff) std::fclose(ff); - if(fff) std::fclose(fff); } }