Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make QSaveFile work on Windows when the target file already exists.

Browse Source
This commit is contained in:
Felix Geyer 2012-10-22 17:48:13 +02:00
parent caec47b1e5
commit 59847f4f30
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/qsavefile.cpp
View File

@ -288,30 +288,33 @@ bool QSaveFile::commit()
d->tempFile = 0; d->tempFile = 0;
return false; return false;
} }
// atomically replace old file with new file
// Can't use QFile::rename for that, must use the file engine directly
// But that's not available in Qt5, nor is QTemporaryFileEngine
// (used by the Qt5-QFileDevice-based QSaveFile).
// So we have to do it by hand (non portable) for now.
d->tempFile->close(); d->tempFile->close();
#if 1 #ifdef Q_OS_WIN
// On Windows QAbstractFileEngine::rename() fails if the the target exists,
// so we have to rename the target.
// Ideally the winapi ReplaceFile() method should be used.
QString bakname = d->fileName + "~";
QFile::remove(bakname);
QFile::rename(d->fileName, bakname);
#endif
QAbstractFileEngine* fileEngine = d->tempFile->fileEngine(); QAbstractFileEngine* fileEngine = d->tempFile->fileEngine();
Q_ASSERT(fileEngine); Q_ASSERT(fileEngine);
if (!fileEngine->rename(d->fileName)) { if (!fileEngine->rename(d->fileName)) {
d->error = fileEngine->error(); d->error = fileEngine->error();
setErrorString(fileEngine->errorString()); setErrorString(fileEngine->errorString());
#else
if (::rename(QFile::encodeName(d->tempFile->fileName()).constData(), QFile::encodeName(d->fileName).constData()) != 0) {
d->error = QFile::RenameError;
setErrorString(QString::fromLocal8Bit(strerror(errno)));
#endif
d->tempFile->remove(); d->tempFile->remove();
delete d->tempFile; delete d->tempFile;
d->tempFile = 0; d->tempFile = 0;
#ifdef Q_OS_WIN
QFile::rename(bakname, d->fileName);
#endif
return false; return false;
} }
delete d->tempFile; delete d->tempFile;
d->tempFile = 0; d->tempFile = 0;
#ifdef Q_OS_WIN
QFile::remove(bakname);
#endif
return true; return true;
} }