summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-02-10 21:52:38 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-02-11 02:28:27 +0100
commit246bbb611d4cd5e2a13ecffb6cbe0e76390eae6f (patch)
treeb26d839bc4a41e98153706084ed41778a85026a4 /apt-inst
parente209542632e61b9bf07b809c333f1e4b9de7fde9 (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 'apt-inst')
-rw-r--r--apt-inst/dirstream.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index b62bdcae1..e06c30a57 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -19,6 +19,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/time.h>
#include <errno.h>
#include <unistd.h>
#include <apti18n.h>
@@ -95,11 +96,11 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
/* Set the modification times. The only way it can fail is if someone
has futzed with our file, which is intolerable :> */
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = times[1].tv_sec = Itm.MTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- if (futimens(Fd, times) != 0)
- _error->Errno("futimens", "Failed to set modification time for %s",Itm.Name);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ if (utimes(Itm.Name, times) != 0)
+ _error->Errno("utimes", "Failed to set modification time for %s",Itm.Name);
if (close(Fd) != 0)
return _error->Errno("close",_("Failed to close file %s"),Itm.Name);