diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-28 16:43:49 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-28 16:43:49 +0100 |
| commit | acead5b93cf49ab33cba4be2ea8e1b253ed0f2bf (patch) | |
| tree | 7c8631716d2182c7891533a0e4ce3b6962595f17 /methods/server.cc | |
| parent | f4a631adf2f14c99d61ecb7f61cb1b3625c1cde4 (diff) | |
| parent | bae81c1307e956aa8928c9d6a77830fb733cd61f (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'methods/server.cc')
| -rw-r--r-- | methods/server.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/methods/server.cc b/methods/server.cc index a2128441c..e12c23c07 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -17,9 +17,9 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/netrc.h> +#include <fcntl.h> #include <sys/stat.h> #include <sys/time.h> -#include <utime.h> #include <unistd.h> #include <signal.h> #include <stdio.h> @@ -368,14 +368,14 @@ void ServerMethod::SigTerm(int) { if (FailFd == -1) _exit(100); + + struct timespec times[2]; + times[0].tv_sec = FailTime; + times[1].tv_sec = FailTime; + times[0].tv_nsec = times[1].tv_nsec = 0; + futimens(FailFd, times); close(FailFd); - - // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(FailFile.c_str(),&UBuf); - + _exit(100); } /*}}}*/ @@ -539,11 +539,10 @@ int ServerMethod::Loop() File = 0; // Timestamp - struct utimbuf UBuf; - time(&UBuf.actime); - UBuf.actime = Server->Date; - UBuf.modtime = Server->Date; - utime(Queue->DestFile.c_str(),&UBuf); + struct timespec 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); // Send status to APT if (Result == true) |