empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Win32: Use MoveFileEx to replace the target in one operation

Browse source
This commit is contained in:
Ilari Liusvaara 2013-02-07 13:16:52 +02:00
parent 891d10fcc6
commit 833a16437f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/library/zip.cpp
View file

@ -12,9 +12,21 @@
#include <boost/iostreams/filter/zlib.hpp> #include <boost/iostreams/filter/zlib.hpp>
#include <boost/iostreams/filtering_stream.hpp> #include <boost/iostreams/filtering_stream.hpp>
#include <boost/iostreams/device/back_inserter.hpp> #include <boost/iostreams/device/back_inserter.hpp>
#if defined(_WIN32) || defined(_WIN64) || defined(TEST_WIN32_CODE)
#include <windows.h>
#endif
namespace namespace
{ {
int lsnes_rename(const char* oldname, const char* newname)
{
#if defined(_WIN32) || defined(_WIN64) || defined(TEST_WIN32_CODE)
return MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING);
#else
return rename(oldname, newname);
#endif
}
uint32_t read32(const unsigned char* buf, unsigned offset = 0, unsigned modulo = 4) throw() uint32_t read32(const unsigned char* buf, unsigned offset = 0, unsigned modulo = 4) throw()
{ {
return (uint32_t)buf[offset % modulo] | return (uint32_t)buf[offset % modulo] |
@ -439,12 +451,8 @@ void zip_writer::commit() throw(std::bad_alloc, std::logic_error, std::runtime_e
throw std::runtime_error("Failed to write central directory end marker to output file"); throw std::runtime_error("Failed to write central directory end marker to output file");
zipstream.close(); zipstream.close();
std::string backup = zipfile_path + ".backup"; std::string backup = zipfile_path + ".backup";
#if defined(_WIN32) || defined(_WIN64) || defined(TEST_WIN32_CODE) lsnes_rename(zipfile_path.c_str(), backup.c_str());
//Grumble, Windows seemingly can't do this atomically. if(lsnes_rename(temp_path.c_str(), zipfile_path.c_str()) < 0)
remove(backup.c_str());
#endif
rename(zipfile_path.c_str(), backup.c_str());
if(rename(temp_path.c_str(), zipfile_path.c_str()) < 0)
throw std::runtime_error("Can't rename '" + temp_path + "' -> '" + zipfile_path + "'"); throw std::runtime_error("Can't rename '" + temp_path + "' -> '" + zipfile_path + "'");
committed = true; committed = true;
} }