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

[apt.git] / methods / copy.cc

diff --git a/methods/copy.cc b/methods/copy.cc
index 94467e054c7e5f687fa1fd36fa287d82580ba232..f2a8f9ed8a4154032eea2b530f032d6b6f0f11b0 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -12,12 +12,13 @@
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/strutl.h>

 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>

-#include <utime.h>
+#include <sys/time.h>

 #include <unistd.h>
 #include <apti18n.h>
                                                                        /*}}}*/
 #include <unistd.h>
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -37,7 +38,7 @@ class CopyMethod : public pkgAcqMethod
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;

-   string File = Get.Path;
+   std::string File = Get.Path;

 
    // Stat the file and send a start message
    struct stat Buf;
 
    // Stat the file and send a start message
    struct stat Buf;


@@ -71,20 +72,18 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
    From.Close();
    To.Close();
 
    From.Close();
    To.Close();

-   
+

    // Transfer the modification times
    // Transfer the modification times

-   struct utimbuf TimeBuf;
-   TimeBuf.actime = Buf.st_atime;
-   TimeBuf.modtime = Buf.st_mtime;
-   if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
-   {
-      To.OpFail();
-      return _error->Errno("utime",_("Failed to set modification time"));
-   }
-   
+   struct timeval times[2];
+   times[0].tv_sec = Buf.st_atime;
+   times[1].tv_sec = Buf.st_mtime;
+   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);
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);

-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);

    Res.TakeHashes(Hash);
 
    URIDone(Res);
    Res.TakeHashes(Hash);
 
    URIDone(Res);