1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use utimensat instead of utimes

Browse Source 
From the manual page:
Note: modern applications may prefer to use the interfaces
described in utimensat(2).

Change-Id: Ib20d8b9b50626233852ca351452ce90841a39603
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-03-02 00:24:21 +02:00
parent d48dbafeb2
commit 855a6cb676
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp
View File

@ -16,6 +16,8 @@
#include <qsysinfo.h> #include <qsysinfo.h>
#if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS) #if defined(Q_OS_UNIX) && !defined(Q_OS_VXWORKS)
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> // utimensat
#include <sys/time.h> #include <sys/time.h>
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
# include <qt_windows.h> # include <qt_windows.h>
@ -516,7 +518,7 @@ void tst_QLockFile::corruptedLockFile()
void tst_QLockFile::corruptedLockFileInTheFuture() void tst_QLockFile::corruptedLockFileInTheFuture()
{ {
#if !defined(Q_OS_UNIX) #if !defined(Q_OS_UNIX)
QSKIP("This tests needs utimes"); QSKIP("This test needs utimensat");
#else #else
// This test is the same as the previous one, but the corruption was so there is a corrupted // This test is the same as the previous one, but the corruption was so there is a corrupted
// .rmlock whose timestamp is in the future // .rmlock whose timestamp is in the future
@ -528,11 +530,12 @@ void tst_QLockFile::corruptedLockFileInTheFuture()
QVERIFY(file.open(QFile::WriteOnly)); QVERIFY(file.open(QFile::WriteOnly));
} }
struct timeval times[2]; struct timespec times[2];
gettimeofday(times, 0); clock_gettime(CLOCK_REALTIME, times);
times[1].tv_sec = (times[0].tv_sec += 600); times[0].tv_sec += 600;
times[1].tv_usec = times[0].tv_usec; times[1].tv_sec = times[0].tv_sec;
utimes(fileName.toLocal8Bit(), times); times[1].tv_nsec = times[0].tv_nsec;
utimensat(0 /* ignored */, fileName.toLocal8Bit(), times, 0);
QTest::ignoreMessage(QtInfoMsg, "QLockFile: Lock file '" + fileName.toUtf8() + "' has a modification time in the future"); QTest::ignoreMessage(QtInfoMsg, "QLockFile: Lock file '" + fileName.toUtf8() + "' has a modification time in the future");
corruptedLockFile(); corruptedLockFile();