fs/io/FileOutputStream: decouple from the FileSystem library

This commit is contained in:
Max Kellermann 2016-08-15 22:42:44 +02:00
parent 6a95c34a81
commit 196ce8426b
1 changed files with 3 additions and 13 deletions

View File

@ -19,7 +19,6 @@
#include "config.h"
#include "FileOutputStream.hxx"
#include "fs/FileSystem.hxx"
#include "system/Error.hxx"
#ifdef WIN32
@ -77,10 +76,7 @@ FileOutputStream::Cancel()
Close();
try {
RemoveFile(GetPath());
} catch (std::runtime_error) {
}
DeleteFile(GetPath().c_str());
}
#else
@ -157,10 +153,7 @@ FileOutputStream::Commit()
#if HAVE_LINKAT
if (is_tmpfile) {
try {
RemoveFile(GetPath());
} catch (std::runtime_error) {
}
unlink(GetPath().c_str());
/* hard-link the temporary file to the final path */
char fd_path[64];
@ -193,10 +186,7 @@ FileOutputStream::Cancel()
#ifdef HAVE_LINKAT
if (!is_tmpfile)
#endif
try {
RemoveFile(GetPath());
} catch (std::runtime_error) {
}
unlink(GetPath().c_str());
}
#endif