diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-02 10:36:46 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-05 16:41:42 +0000 |
| commit | a3c71b71e2033b92c74e54fc316ea42df2344ed2 (patch) | |
| tree | 70cebe91a82f7652b96b18ce61a47f7480cb29f8 /src/corelib/io | |
| parent | 6c3a3d498a8797c481a394418fff8f7bf1886c61 (diff) | |
QFileSystemEngine::setFileTime/Unix: remove the fallback to futimesat
The use as in the code:
futimesat(fd, NULL, &tv)
is not documented to work. The file descriptor should be a directory's
one, not an open file (though the Linux source code seems to handle that
case). This call was done as a fallback to futimes, so it's very
unlikely a system would have futimesat and not futimes.
Both the Linux and the FreeBSD man pages say it's deprecated anyway.
Change-Id: I8d96dea9955d4c749b99fffd14cd94068dc7668a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index a1108e0fe6..0b16c62f76 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -157,7 +157,7 @@ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e } #endif -#if !QT_CONFIG(futimens) && (QT_CONFIG(futimes) || QT_CONFIG(futimesat)) +#if !QT_CONFIG(futimens) && (QT_CONFIG(futimes)) namespace { namespace GetFileTimes { @@ -873,7 +873,7 @@ bool QFileSystemEngine::setFileTime(int fd, const QDateTime &newDate, QAbstractF } return true; -#elif QT_CONFIG(futimes) || QT_CONFIG(futimesat) +#elif QT_CONFIG(futimes) struct timeval tv[2]; QT_STATBUF st; @@ -894,11 +894,7 @@ bool QFileSystemEngine::setFileTime(int fd, const QDateTime &newDate, QAbstractF tv[1].tv_usec = (msecs % 1000) * 1000; } -#if QT_CONFIG(futimes) if (futimes(fd, tv) == -1) { -#else - if (futimesat(fd, NULL, tv) == -1) { -#endif error = QSystemError(errno, QSystemError::StandardLibraryError); return false; } |