diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-29 14:03:26 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-04 17:29:52 +0000 |
| commit | 363dc9146e53e24172bb9c0ae68100a8543bd9ae (patch) | |
| tree | 49374e22f5986e9a99e46e0f73a187f55ef67bc9 /src/corelib/io/qfsfileengine_unix.cpp | |
| parent | 74197140be68fd7fe54c3a346a0e769928d7a3ea (diff) | |
QFSFileEngine: make rename() on Unix not overwrite
The rename(2) system call overwrites, so instead of using it, we try to
use the link/unlink pair. This works for regular cases, but can fail if
trying to change case in case-insensitive filesystems, if we're
operating on a non-Unix filesystem (FAT) or, on Linux, if the file
doesn't belong to the calling user (BSDs permit this). For those cases,
we fall back to rename(2).
That means there's a race condition if a new file is created there. But
we at least reduce the likelihood of that happening for regular files.
Change-Id: I1eba2b016de74620bfc8fffd14ccb38fd929e5aa
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/io/qfsfileengine_unix.cpp')
| -rw-r--r-- | src/corelib/io/qfsfileengine_unix.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index ab762d2b4d..771810a06e 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -362,8 +362,14 @@ bool QFSFileEngine::copy(const QString &newName) bool QFSFileEngine::renameOverwrite(const QString &newName) { - // On Unix, rename() overwrites. - return rename(newName); + Q_D(QFSFileEngine); + QSystemError error; + bool ret = QFileSystemEngine::renameOverwriteFile(d->fileEntry, QFileSystemEntry(newName), error); + + if (!ret) + setError(QFile::RenameError, error.toString()); + + return ret; } bool QFSFileEngine::rename(const QString &newName) |