summaryrefslogtreecommitdiff
path: root/lib/backupstore
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2020-05-10 15:21:30 -0400
committerReinhard Tartler <siretart@tauware.de>2020-05-10 15:21:30 -0400
commit657715ed754d69235aac62cd36f514f6dc65aab8 (patch)
tree96e6f410510f5d009de950fee644ba32ae79d593 /lib/backupstore
parent6017757bc079f4446aa77bc5c0855c52741280f4 (diff)
New upstream version 0.13~~git20200326.g8e8b63c
Diffstat (limited to 'lib/backupstore')
-rw-r--r--lib/backupstore/BackupClientFileAttributes.cpp2
-rw-r--r--lib/backupstore/BackupStoreFile.cpp2
-rw-r--r--lib/backupstore/BackupStoreRefCountDatabase.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/backupstore/BackupClientFileAttributes.cpp b/lib/backupstore/BackupClientFileAttributes.cpp
index 37140301..431e5587 100644
--- a/lib/backupstore/BackupClientFileAttributes.cpp
+++ b/lib/backupstore/BackupClientFileAttributes.cpp
@@ -814,7 +814,7 @@ void BackupClientFileAttributes::WriteAttributes(const std::string& Filename,
Filename << "'");
#else
// Make a symlink, first deleting anything in the way
- ::unlink(Filename.c_str());
+ EMU_UNLINK(Filename.c_str());
if(::symlink((char*)(pattr + 1), Filename.c_str()) != 0)
{
BOX_LOG_SYS_ERROR("Failed to symlink '" << Filename <<
diff --git a/lib/backupstore/BackupStoreFile.cpp b/lib/backupstore/BackupStoreFile.cpp
index 99562685..a3e23204 100644
--- a/lib/backupstore/BackupStoreFile.cpp
+++ b/lib/backupstore/BackupStoreFile.cpp
@@ -677,7 +677,7 @@ void BackupStoreFile::DecodeFile(IOStream &rEncodedFile, const char *DecodedFile
}
catch(...)
{
- ::unlink(DecodedFilename);
+ EMU_UNLINK(DecodedFilename);
throw;
}
}
diff --git a/lib/backupstore/BackupStoreRefCountDatabase.cpp b/lib/backupstore/BackupStoreRefCountDatabase.cpp
index 86da0943..cba989ed 100644
--- a/lib/backupstore/BackupStoreRefCountDatabase.cpp
+++ b/lib/backupstore/BackupStoreRefCountDatabase.cpp
@@ -68,7 +68,7 @@ void BackupStoreRefCountDatabase::Commit()
std::string Final_Filename = GetFilename(mAccount, false);
#ifdef WIN32
- if(FileExists(Final_Filename) && unlink(Final_Filename.c_str()) != 0)
+ if(FileExists(Final_Filename) && EMU_UNLINK(Final_Filename.c_str()) != 0)
{
THROW_EMU_FILE_ERROR("Failed to delete old permanent refcount "
"database file", mFilename, CommonException,
@@ -106,7 +106,7 @@ void BackupStoreRefCountDatabase::Discard()
mapDatabaseFile.reset();
}
- if(unlink(mFilename.c_str()) != 0)
+ if(EMU_UNLINK(mFilename.c_str()) != 0)
{
THROW_EMU_FILE_ERROR("Failed to delete temporary refcount "
"database file", mFilename, CommonException,
@@ -187,7 +187,7 @@ std::auto_ptr<BackupStoreRefCountDatabase>
{
BOX_WARNING(BOX_FILE_MESSAGE(Filename, "Overwriting existing "
"temporary reference count database"));
- if (unlink(Filename.c_str()) != 0)
+ if(EMU_UNLINK(Filename.c_str()) != 0)
{
THROW_SYS_FILE_ERROR("Failed to delete old temporary "
"reference count database file", Filename,