Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

[apt.git] / methods / server.cc

diff --git a/methods/server.cc b/methods/server.cc
index a2128441cb78a005c108ceddd23c36142872515b..e12c23c0759b98156c92b2d01b16c11bf150caef 100644 (file)
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -17,9 +17,9 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 

+#include <fcntl.h>

 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/time.h>

-#include <utime.h>

 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>


@@ -368,14 +368,14 @@ void ServerMethod::SigTerm(int)
 {
    if (FailFd == -1)
       _exit(100);
 {
    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);
    close(FailFd);

-   
-   // Timestamp
-   struct utimbuf UBuf;
-   UBuf.actime = FailTime;
-   UBuf.modtime = FailTime;
-   utime(FailFile.c_str(),&UBuf);
-   
+

    _exit(100);
 }
                                                                        /*}}}*/
    _exit(100);
 }
                                                                        /*}}}*/


@@ -539,11 +539,10 @@ int ServerMethod::Loop()
            File = 0;
            
            // Timestamp
            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)
 
            // Send status to APT
            if (Result == true)