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/copy.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/copy.cc')
-rw-r--r-- | methods/copy.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/methods/copy.cc b/methods/copy.cc index 744cc2b51..f2a8f9ed8 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -18,6 +18,7 @@ #include <apt-pkg/hashes.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <apti18n.h> /*}}}*/ @@ -70,18 +71,15 @@ bool CopyMethod::Fetch(FetchItem *Itm) } From.Close(); + To.Close(); // Transfer the modification times - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Buf.st_atime; times[1].tv_sec = Buf.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(To.Fd(), times) != 0) - { - To.OpFail(); - return _error->Errno("futimens",_("Failed to set modification time")); - } - To.Close(); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Res.Filename.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); |