generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 11:06:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/FileFailOnOverwrite' of https://github.com/KevDi/poco into feature/FileFailOnOverwrite

Browse Source
This commit is contained in:
Jan Kevin Dick
2019-11-26 13:04:49 +01:00
parent d5a25f2053 936441df93
commit 3424ee7bc8
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Foundation/src/File_UNIX.cpp
View File

@@ -384,6 +384,11 @@ void FileImpl::renameToImpl(const std::string& path, int options)
{ {
poco_assert (!_path.empty()); poco_assert (!_path.empty());
struct stat st;
if (stat(path.c_str(), &st) == 0 && failOnOverwrite)
throw FileExistsException(path, EEXIST);
if (rename(_path.c_str(), path.c_str()) != 0) if (rename(_path.c_str(), path.c_str()) != 0)
handleLastErrorImpl(_path); handleLastErrorImpl(_path);
} }

5
Foundation/src/File_VX.cpp
View File

@@ -286,6 +286,11 @@ void FileImpl::renameToImpl(const std::string& path, int options)
{ {
poco_assert (!_path.empty()); poco_assert (!_path.empty());
struct stat st;
if (stat(path.c_str(), &st) == 0 && failOnOverwrite)
throw FileExistsException(path, EEXIST);
if (rename(_path.c_str(), path.c_str()) != 0) if (rename(_path.c_str(), path.c_str()) != 0)
handleLastErrorImpl(_path); handleLastErrorImpl(_path);
} }