diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-02-10 21:52:38 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-02-11 02:28:27 +0100 |
| commit | 246bbb611d4cd5e2a13ecffb6cbe0e76390eae6f (patch) | |
| tree | b26d839bc4a41e98153706084ed41778a85026a4 /methods/server.cc | |
| parent | e209542632e61b9bf07b809c333f1e4b9de7fde9 (diff) | |
use utimes instead of utimensat/futimens
cppcheck complains about the obsolete utime as it was removed in
POSIX1.2008 and recommends usage of utimensat/futimens instead
as those are in POSIX and so commit 9ce3cfc9 switched to them.
It is just that they aren't as portable as the standard suggests:
At least our kFreeBSD and Hurd ports stumble over it at runtime.
So to make both, the ports and cppcheck happy, we use utimes instead.
Closes: 738567
Diffstat (limited to 'methods/server.cc')
| -rw-r--r-- | methods/server.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/methods/server.cc b/methods/server.cc index e12c23c07..76faa7e7f 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -369,11 +369,11 @@ void ServerMethod::SigTerm(int) if (FailFd == -1) _exit(100); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); _exit(100); @@ -539,10 +539,10 @@ int ServerMethod::Loop() File = 0; // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = times[1].tv_sec = Server->Date; - times[0].tv_nsec = times[1].tv_nsec = 0; - utimensat(AT_FDCWD, Queue->DestFile.c_str(), times, AT_SYMLINK_NOFOLLOW); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Queue->DestFile.c_str(), times); // Send status to APT if (Result == true) |